diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-15 21:30:45 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-15 21:30:45 +0000 |
| commit | 6b06cb80be64fcf207bee734cc678c25434ed1a4 (patch) | |
| tree | aebc37ae3a2658fba3f57003102fa0dfb1a10ac8 /miscutils/makedevs.c | |
| parent | 43d5d429fd7a80ca02eb8388f058fd9654cc118d (diff) | |
| download | busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.gz busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.bz2 busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.zip | |
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 43e4b8c4d..3b45d70b4 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
| @@ -99,12 +99,12 @@ int makedevs_main(int argc, char **argv) | |||
| 99 | 99 | ||
| 100 | while ((line = xmalloc_fgetline(table)) != NULL) { | 100 | while ((line = xmalloc_fgetline(table)) != NULL) { |
| 101 | char type; | 101 | char type; |
| 102 | unsigned int mode = 0755; | 102 | unsigned mode = 0755; |
| 103 | unsigned int major = 0; | 103 | unsigned major = 0; |
| 104 | unsigned int minor = 0; | 104 | unsigned minor = 0; |
| 105 | unsigned int count = 0; | 105 | unsigned count = 0; |
| 106 | unsigned int increment = 0; | 106 | unsigned increment = 0; |
| 107 | unsigned int start = 0; | 107 | unsigned start = 0; |
| 108 | char name[41]; | 108 | char name[41]; |
| 109 | char user[41]; | 109 | char user[41]; |
| 110 | char group[41]; | 110 | char group[41]; |
| @@ -121,7 +121,7 @@ int makedevs_main(int argc, char **argv) | |||
| 121 | { | 121 | { |
| 122 | if (*line=='\0' || *line=='#' || isspace(*line)) | 122 | if (*line=='\0' || *line=='#' || isspace(*line)) |
| 123 | continue; | 123 | continue; |
| 124 | bb_error_msg("line %d invalid: '%s'", linenum, line); | 124 | bb_error_msg("invalid line %d: '%s'", linenum, line); |
| 125 | ret = EXIT_FAILURE; | 125 | ret = EXIT_FAILURE; |
| 126 | continue; | 126 | continue; |
| 127 | } | 127 | } |
| @@ -140,7 +140,7 @@ int makedevs_main(int argc, char **argv) | |||
| 140 | ret = EXIT_FAILURE; | 140 | ret = EXIT_FAILURE; |
| 141 | goto loop; | 141 | goto loop; |
| 142 | } | 142 | } |
| 143 | if ((mode != -1) && (chmod(full_name, mode) < 0)){ | 143 | if (chmod(full_name, mode) < 0) { |
| 144 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); | 144 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); |
| 145 | ret = EXIT_FAILURE; | 145 | ret = EXIT_FAILURE; |
| 146 | goto loop; | 146 | goto loop; |
| @@ -157,7 +157,7 @@ int makedevs_main(int argc, char **argv) | |||
| 157 | ret = EXIT_FAILURE; | 157 | ret = EXIT_FAILURE; |
| 158 | goto loop; | 158 | goto loop; |
| 159 | } | 159 | } |
| 160 | if ((mode != -1) && (chmod(full_name, mode) < 0)){ | 160 | if (chmod(full_name, mode) < 0) { |
| 161 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); | 161 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); |
| 162 | ret = EXIT_FAILURE; | 162 | ret = EXIT_FAILURE; |
| 163 | goto loop; | 163 | goto loop; |
| @@ -180,7 +180,7 @@ int makedevs_main(int argc, char **argv) | |||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | if (count > 0) { | 182 | if (count > 0) { |
| 183 | int i; | 183 | unsigned i; |
| 184 | char *full_name_inc; | 184 | char *full_name_inc; |
| 185 | 185 | ||
| 186 | full_name_inc = xmalloc(strlen(full_name) + 4); | 186 | full_name_inc = xmalloc(strlen(full_name) + 4); |
| @@ -195,7 +195,7 @@ int makedevs_main(int argc, char **argv) | |||
| 195 | bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc); | 195 | bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc); |
| 196 | ret = EXIT_FAILURE; | 196 | ret = EXIT_FAILURE; |
| 197 | } | 197 | } |
| 198 | if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){ | 198 | if (chmod(full_name_inc, mode) < 0) { |
| 199 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc); | 199 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc); |
| 200 | ret = EXIT_FAILURE; | 200 | ret = EXIT_FAILURE; |
| 201 | } | 201 | } |
| @@ -211,7 +211,7 @@ int makedevs_main(int argc, char **argv) | |||
| 211 | bb_perror_msg("line %d: chown failed for %s", linenum, full_name); | 211 | bb_perror_msg("line %d: chown failed for %s", linenum, full_name); |
| 212 | ret = EXIT_FAILURE; | 212 | ret = EXIT_FAILURE; |
| 213 | } | 213 | } |
| 214 | if ((mode != -1) && (chmod(full_name, mode) < 0)){ | 214 | if (chmod(full_name, mode) < 0) { |
| 215 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); | 215 | bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); |
| 216 | ret = EXIT_FAILURE; | 216 | ret = EXIT_FAILURE; |
| 217 | } | 217 | } |