diff options
| author | Denis Vlasenko | 2008-05-15 21:30:45 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-05-15 21:30:45 +0000 |
| commit | 6b06cb80be64fcf207bee734cc678c25434ed1a4 (patch) | |
| tree | aebc37ae3a2658fba3f57003102fa0dfb1a10ac8 /util-linux/getopt.c | |
| parent | 43d5d429fd7a80ca02eb8388f058fd9654cc118d (diff) | |
| download | busybox-6b06cb80be64fcf207bee734cc678c25434ed1a4.zip busybox-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.gz | |
more of -Wall fixes from Cristian Ionescu-Idbohrn.
Some are fixing real bugs.
function old new delta
syslogd_main 938 958 +20
get_signum 136 143 +7
obj_load 777 782 +5
recv_from_to 210 214 +4
get_next_block 1795 1799 +4
display_topmem_process_list 1117 1121 +4
logread_main 484 487 +3
buffer_fill_and_print 73 76 +3
kill_main 687 689 +2
ll_remember_index 240 241 +1
do_stats 452 453 +1
if_readconf 166 165 -1
display_process_list 1192 1191 -1
run_applet_and_exit 507 505 -2
print_signames 33 31 -2
parse_one_line 1092 1090 -2
find_out_spec 57 55 -2
add_ksymoops_symbols 421 419 -2
ash_main 1407 1402 -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 11/8 up/down: 54/-17) Total: 37 bytes
Diffstat (limited to 'util-linux/getopt.c')
| -rw-r--r-- | util-linux/getopt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 2da3481..31790d2 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -147,7 +147,7 @@ static const char *normalize(const char *arg) static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts) { int exit_code = 0; /* We assume everything will be OK */ - unsigned opt; + int opt; #if ENABLE_GETOPT_LONG int longindex; #endif @@ -173,7 +173,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru #else getopt(argc, argv, optstr); #endif - if (opt == EOF) + if (opt == -1) break; if (opt == '?' || opt == ':' ) exit_code = 1; @@ -190,7 +190,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru printf(" %s", normalize(optarg)); else { printf(" -%c", opt); - charptr = strchr(optstr,opt); + charptr = strchr(optstr, opt); if (charptr != NULL && *++charptr == ':') printf(" %s", normalize(optarg ? optarg : "")); |