diff options
| author | Alexey Fomenko | 2011-03-01 19:25:49 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2011-03-01 19:25:49 +0100 |
| commit | ea6116ee59af0945f4a6ac9ede984930a0ede429 (patch) | |
| tree | 83e00b14ba3dde9ffec8a7011fdecd611bafd11d | |
| parent | 5e29e263888284b2451debd9e5cb138b48fd293a (diff) | |
| download | busybox-ea6116ee59af0945f4a6ac9ede984930a0ede429.zip busybox-ea6116ee59af0945f4a6ac9ede984930a0ede429.tar.gz | |
libbb: remove dead code in getopt32. -7 bytes
Signed-off-by: Alexey Fomenko <ext-alexey.fomenko@nokia.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/getopt32.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libbb/getopt32.c b/libbb/getopt32.c index f3f1cfc..18f33c7 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c @@ -542,8 +542,6 @@ getopt32(char **argv, const char *applet_opts, ...) #endif /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */ - pargv = NULL; - /* Note: just "getopt() <= 0" will not work well for * "fake" short options, like this one: * wget $'-\203' "Test: test" http://kernel.org/ @@ -574,19 +572,16 @@ getopt32(char **argv, const char *applet_opts, ...) flags ^= trigger; if (on_off->counter) (*(on_off->counter))++; - if (on_off->param_type == PARAM_LIST) { - if (optarg) + if (optarg) { + if (on_off->param_type == PARAM_LIST) { llist_add_to_end((llist_t **)(on_off->optarg), optarg); - } else if (on_off->param_type == PARAM_INT) { - if (optarg) + } else if (on_off->param_type == PARAM_INT) { //TODO: xatoi_positive indirectly pulls in printf machinery *(unsigned*)(on_off->optarg) = xatoi_positive(optarg); - } else if (on_off->optarg) { - if (optarg) + } else if (on_off->optarg) { *(char **)(on_off->optarg) = optarg; + } } - if (pargv != NULL) - break; } /* check depending requires for given options */ |