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 | |
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')
-rw-r--r-- | miscutils/crond.c | 2 | ||||
-rw-r--r-- | miscutils/hdparm.c | 3 | ||||
-rw-r--r-- | miscutils/less.c | 24 | ||||
-rw-r--r-- | miscutils/makedevs.c | 24 |
4 files changed, 27 insertions, 26 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c index 0b2d55822..6db4df422 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -423,7 +423,7 @@ static char *ParseField(char *user, char *ary, int modvalue, int off, | |||
423 | 423 | ||
424 | static void FixDayDow(CronLine *line) | 424 | static void FixDayDow(CronLine *line) |
425 | { | 425 | { |
426 | size_t i; | 426 | unsigned i; |
427 | int weekUsed = 0; | 427 | int weekUsed = 0; |
428 | int daysUsed = 0; | 428 | int daysUsed = 0; |
429 | 429 | ||
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index ec5ede691..7afa9ff86 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -1486,7 +1486,8 @@ static const char xfermode_name[][5] ALIGN1 = { | |||
1486 | 1486 | ||
1487 | static int translate_xfermode(const char *name) | 1487 | static int translate_xfermode(const char *name) |
1488 | { | 1488 | { |
1489 | int val, i; | 1489 | int val; |
1490 | unsigned i; | ||
1490 | 1491 | ||
1491 | for (i = 0; i < ARRAY_SIZE(xfermode_val); i++) { | 1492 | for (i = 0; i < ARRAY_SIZE(xfermode_val); i++) { |
1492 | if (!strncmp(name, xfermode_name[i], 5)) | 1493 | if (!strncmp(name, xfermode_name[i], 5)) |
diff --git a/miscutils/less.c b/miscutils/less.c index 065bf6f38..25b91c0fe 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -297,7 +297,7 @@ static void read_lines(void) | |||
297 | new_linepos += 7; | 297 | new_linepos += 7; |
298 | new_linepos &= (~7); | 298 | new_linepos &= (~7); |
299 | } | 299 | } |
300 | if (new_linepos >= w) | 300 | if ((int)new_linepos >= w) |
301 | break; | 301 | break; |
302 | linepos = new_linepos; | 302 | linepos = new_linepos; |
303 | } | 303 | } |
@@ -415,7 +415,7 @@ static void m_status_print(void) | |||
415 | printf(" lines %i-%i/%i ", | 415 | printf(" lines %i-%i/%i ", |
416 | cur_fline + 1, cur_fline + max_displayed_line + 1, | 416 | cur_fline + 1, cur_fline + max_displayed_line + 1, |
417 | max_fline + 1); | 417 | max_fline + 1); |
418 | if (cur_fline >= max_fline - max_displayed_line) { | 418 | if (cur_fline >= (int)(max_fline - max_displayed_line)) { |
419 | printf("(END)"NORMAL); | 419 | printf("(END)"NORMAL); |
420 | if (num_files > 1 && current_file != num_files) | 420 | if (num_files > 1 && current_file != num_files) |
421 | printf(HIGHLIGHT" - next: %s"NORMAL, files[current_file]); | 421 | printf(HIGHLIGHT" - next: %s"NORMAL, files[current_file]); |
@@ -444,7 +444,7 @@ static void status_print(void) | |||
444 | #endif | 444 | #endif |
445 | 445 | ||
446 | clear_line(); | 446 | clear_line(); |
447 | if (cur_fline && cur_fline < max_fline - max_displayed_line) { | 447 | if (cur_fline && cur_fline < (int)(max_fline - max_displayed_line)) { |
448 | bb_putchar(':'); | 448 | bb_putchar(':'); |
449 | return; | 449 | return; |
450 | } | 450 | } |
@@ -587,7 +587,7 @@ static void print_ascii(const char *str) | |||
587 | /* Print the buffer */ | 587 | /* Print the buffer */ |
588 | static void buffer_print(void) | 588 | static void buffer_print(void) |
589 | { | 589 | { |
590 | int i; | 590 | unsigned i; |
591 | 591 | ||
592 | move_cursor(0, 0); | 592 | move_cursor(0, 0); |
593 | for (i = 0; i <= max_displayed_line; i++) | 593 | for (i = 0; i <= max_displayed_line; i++) |
@@ -600,7 +600,7 @@ static void buffer_print(void) | |||
600 | 600 | ||
601 | static void buffer_fill_and_print(void) | 601 | static void buffer_fill_and_print(void) |
602 | { | 602 | { |
603 | int i; | 603 | unsigned i; |
604 | for (i = 0; i <= max_displayed_line && cur_fline + i <= max_fline; i++) { | 604 | for (i = 0; i <= max_displayed_line && cur_fline + i <= max_fline; i++) { |
605 | buffer[i] = flines[cur_fline + i]; | 605 | buffer[i] = flines[cur_fline + i]; |
606 | } | 606 | } |
@@ -662,7 +662,7 @@ static void open_file_and_read_lines(void) | |||
662 | /* Reinitialize everything for a new file - free the memory and start over */ | 662 | /* Reinitialize everything for a new file - free the memory and start over */ |
663 | static void reinitialize(void) | 663 | static void reinitialize(void) |
664 | { | 664 | { |
665 | int i; | 665 | unsigned i; |
666 | 666 | ||
667 | if (flines) { | 667 | if (flines) { |
668 | for (i = 0; i <= max_fline; i++) | 668 | for (i = 0; i <= max_fline; i++) |
@@ -763,7 +763,7 @@ static int less_getch(int pos) | |||
763 | static char* less_gets(int sz) | 763 | static char* less_gets(int sz) |
764 | { | 764 | { |
765 | char c; | 765 | char c; |
766 | int i = 0; | 766 | unsigned i = 0; |
767 | char *result = xzalloc(1); | 767 | char *result = xzalloc(1); |
768 | 768 | ||
769 | while (1) { | 769 | while (1) { |
@@ -836,7 +836,7 @@ static void change_file(int direction) | |||
836 | 836 | ||
837 | static void remove_current_file(void) | 837 | static void remove_current_file(void) |
838 | { | 838 | { |
839 | int i; | 839 | unsigned i; |
840 | 840 | ||
841 | if (num_files < 2) | 841 | if (num_files < 2) |
842 | return; | 842 | return; |
@@ -974,7 +974,7 @@ static void regex_process(void) | |||
974 | match_pos = 0; | 974 | match_pos = 0; |
975 | fill_match_lines(0); | 975 | fill_match_lines(0); |
976 | while (match_pos < num_matches) { | 976 | while (match_pos < num_matches) { |
977 | if (match_lines[match_pos] > cur_fline) | 977 | if ((int)match_lines[match_pos] > cur_fline) |
978 | break; | 978 | break; |
979 | match_pos++; | 979 | match_pos++; |
980 | } | 980 | } |
@@ -990,7 +990,7 @@ static void regex_process(void) | |||
990 | 990 | ||
991 | static void number_process(int first_digit) | 991 | static void number_process(int first_digit) |
992 | { | 992 | { |
993 | int i; | 993 | unsigned i; |
994 | int num; | 994 | int num; |
995 | char num_input[sizeof(int)*4]; /* more than enough */ | 995 | char num_input[sizeof(int)*4]; /* more than enough */ |
996 | char keypress; | 996 | char keypress; |
@@ -1120,7 +1120,7 @@ static void save_input_to_file(void) | |||
1120 | { | 1120 | { |
1121 | const char *msg = ""; | 1121 | const char *msg = ""; |
1122 | char *current_line; | 1122 | char *current_line; |
1123 | int i; | 1123 | unsigned i; |
1124 | FILE *fp; | 1124 | FILE *fp; |
1125 | 1125 | ||
1126 | print_statusline("Log file: "); | 1126 | print_statusline("Log file: "); |
@@ -1204,7 +1204,7 @@ static char opp_bracket(char bracket) | |||
1204 | 1204 | ||
1205 | static void match_right_bracket(char bracket) | 1205 | static void match_right_bracket(char bracket) |
1206 | { | 1206 | { |
1207 | int i; | 1207 | unsigned i; |
1208 | 1208 | ||
1209 | if (strchr(flines[cur_fline], bracket) == NULL) { | 1209 | if (strchr(flines[cur_fline], bracket) == NULL) { |
1210 | print_statusline("No bracket in top line"); | 1210 | print_statusline("No bracket in top line"); |
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 | } |