diff options
| author | Mariusz Pluciński <mplucinski@mplucinski.com> | 2014-07-25 17:04:57 +0200 |
|---|---|---|
| committer | Will Estes <westes575@gmail.com> | 2014-11-23 20:29:49 -0500 |
| commit | 6d1a6a8d595298fd6220d803c917c81fc06a5252 (patch) | |
| tree | 209ed8c5c77e518a9a987cfa45564b3970987bdc | |
| parent | 71e207c1ac1bb664326a5539d93a022bf0deade9 (diff) | |
Remove unused argument and variable from src/scanopt.c:scanopt_err
| -rw-r--r-- | src/scanopt.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/scanopt.c b/src/scanopt.c index 6d8d481..10c372a 100644 --- a/src/scanopt.c +++ b/src/scanopt.c @@ -82,7 +82,7 @@ static int PRINTLEN PROTO ((struct _scanopt_t *, int)); static int RVAL PROTO ((struct _scanopt_t *, int)); static int FLAGS PROTO ((struct _scanopt_t *, int)); static const char *DESC PROTO ((struct _scanopt_t *, int)); -static int scanopt_err PROTO ((struct _scanopt_t *, int, int, int)); +static int scanopt_err PROTO ((struct _scanopt_t *, int, int)); static int matchlongopt PROTO ((char *, char **, int *, char **, int *)); static int find_opt PROTO ((struct _scanopt_t *, int, char *, int, int *, int *opt_offset)); @@ -529,9 +529,8 @@ int scanopt_usage (scanner, fp, usage) #endif /* no scanopt_usage */ -static int scanopt_err (s, opt_offset, is_short, err) +static int scanopt_err (s, is_short, err) struct _scanopt_t *s; - int opt_offset; int is_short; int err; { @@ -745,7 +744,7 @@ int scanopt (svoid, arg, optindex) if (!find_opt (s, 1, optname, namelen, &errcode, &opt_offset)) { - scanopt_err (s, opt_offset, 0, errcode); + scanopt_err (s, 0, errcode); return errcode; } /* We handle this below. */ @@ -780,7 +779,7 @@ int scanopt (svoid, arg, optindex) if (!find_opt (s, 0, pstart, namelen, &errcode, &opt_offset)) { - return scanopt_err (s, opt_offset, 1, errcode); + return scanopt_err (s, 1, errcode); } optarg = pstart + 1; @@ -808,8 +807,7 @@ int scanopt (svoid, arg, optindex) /* case: no args allowed */ if (auxp->flags & ARG_NONE) { if (optarg && !is_short) { - scanopt_err (s, opt_offset, is_short, errcode = - SCANOPT_ERR_ARG_NOT_ALLOWED); + scanopt_err (s, is_short, errcode = SCANOPT_ERR_ARG_NOT_ALLOWED); INC_INDEX (s, 1); return errcode; } @@ -823,8 +821,7 @@ int scanopt (svoid, arg, optindex) /* case: required */ if (auxp->flags & ARG_REQ) { if (!optarg && !has_next) - return scanopt_err (s, opt_offset, is_short, - SCANOPT_ERR_ARG_NOT_FOUND); + return scanopt_err (s, is_short, SCANOPT_ERR_ARG_NOT_FOUND); if (!optarg) { /* Let the next argv element become the argument. */ |