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 /miscutils/makedevs.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 'miscutils/makedevs.c')
-rw-r--r-- | miscutils/makedevs.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 43e4b8c..3b45d70 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -99,12 +99,12 @@ int makedevs_main(int argc, char **argv) while ((line = xmalloc_fgetline(table)) != NULL) { char type; - unsigned int mode = 0755; - unsigned int major = 0; - unsigned int minor = 0; - unsigned int count = 0; - unsigned int increment = 0; - unsigned int start = 0; + unsigned mode = 0755; + unsigned major = 0; + unsigned minor = 0; + unsigned count = 0; + unsigned increment = 0; + unsigned start = 0; char name[41]; char user[41]; char group[41]; @@ -121,7 +121,7 @@ int makedevs_main(int argc, char **argv) { if (*line=='\0' || *line=='#' || isspace(*line)) continue; - bb_error_msg("line %d invalid: '%s'", linenum, line); + bb_error_msg("invalid line %d: '%s'", linenum, line); ret = EXIT_FAILURE; continue; } @@ -140,7 +140,7 @@ int makedevs_main(int argc, char **argv) ret = EXIT_FAILURE; goto loop; } - if ((mode != -1) && (chmod(full_name, mode) < 0)){ + if (chmod(full_name, mode) < 0) { bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); ret = EXIT_FAILURE; goto loop; @@ -157,7 +157,7 @@ int makedevs_main(int argc, char **argv) ret = EXIT_FAILURE; goto loop; } - if ((mode != -1) && (chmod(full_name, mode) < 0)){ + if (chmod(full_name, mode) < 0) { bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); ret = EXIT_FAILURE; goto loop; @@ -180,7 +180,7 @@ int makedevs_main(int argc, char **argv) } if (count > 0) { - int i; + unsigned i; char *full_name_inc; full_name_inc = xmalloc(strlen(full_name) + 4); @@ -195,7 +195,7 @@ int makedevs_main(int argc, char **argv) bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc); ret = EXIT_FAILURE; } - if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){ + if (chmod(full_name_inc, mode) < 0) { bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc); ret = EXIT_FAILURE; } @@ -211,7 +211,7 @@ int makedevs_main(int argc, char **argv) bb_perror_msg("line %d: chown failed for %s", linenum, full_name); ret = EXIT_FAILURE; } - if ((mode != -1) && (chmod(full_name, mode) < 0)){ + if (chmod(full_name, mode) < 0) { bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); ret = EXIT_FAILURE; } |