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/less.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/less.c')
-rw-r--r-- | miscutils/less.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/miscutils/less.c b/miscutils/less.c index 065bf6f..25b91c0 100644 --- a/miscutils/less.c +++ b/miscutils/less.c @@ -297,7 +297,7 @@ static void read_lines(void) new_linepos += 7; new_linepos &= (~7); } - if (new_linepos >= w) + if ((int)new_linepos >= w) break; linepos = new_linepos; } @@ -415,7 +415,7 @@ static void m_status_print(void) printf(" lines %i-%i/%i ", cur_fline + 1, cur_fline + max_displayed_line + 1, max_fline + 1); - if (cur_fline >= max_fline - max_displayed_line) { + if (cur_fline >= (int)(max_fline - max_displayed_line)) { printf("(END)"NORMAL); if (num_files > 1 && current_file != num_files) printf(HIGHLIGHT" - next: %s"NORMAL, files[current_file]); @@ -444,7 +444,7 @@ static void status_print(void) #endif clear_line(); - if (cur_fline && cur_fline < max_fline - max_displayed_line) { + if (cur_fline && cur_fline < (int)(max_fline - max_displayed_line)) { bb_putchar(':'); return; } @@ -587,7 +587,7 @@ static void print_ascii(const char *str) /* Print the buffer */ static void buffer_print(void) { - int i; + unsigned i; move_cursor(0, 0); for (i = 0; i <= max_displayed_line; i++) @@ -600,7 +600,7 @@ static void buffer_print(void) static void buffer_fill_and_print(void) { - int i; + unsigned i; for (i = 0; i <= max_displayed_line && cur_fline + i <= max_fline; i++) { buffer[i] = flines[cur_fline + i]; } @@ -662,7 +662,7 @@ static void open_file_and_read_lines(void) /* Reinitialize everything for a new file - free the memory and start over */ static void reinitialize(void) { - int i; + unsigned i; if (flines) { for (i = 0; i <= max_fline; i++) @@ -763,7 +763,7 @@ static int less_getch(int pos) static char* less_gets(int sz) { char c; - int i = 0; + unsigned i = 0; char *result = xzalloc(1); while (1) { @@ -836,7 +836,7 @@ static void change_file(int direction) static void remove_current_file(void) { - int i; + unsigned i; if (num_files < 2) return; @@ -974,7 +974,7 @@ static void regex_process(void) match_pos = 0; fill_match_lines(0); while (match_pos < num_matches) { - if (match_lines[match_pos] > cur_fline) + if ((int)match_lines[match_pos] > cur_fline) break; match_pos++; } @@ -990,7 +990,7 @@ static void regex_process(void) static void number_process(int first_digit) { - int i; + unsigned i; int num; char num_input[sizeof(int)*4]; /* more than enough */ char keypress; @@ -1120,7 +1120,7 @@ static void save_input_to_file(void) { const char *msg = ""; char *current_line; - int i; + unsigned i; FILE *fp; print_statusline("Log file: "); @@ -1204,7 +1204,7 @@ static char opp_bracket(char bracket) static void match_right_bracket(char bracket) { - int i; + unsigned i; if (strchr(flines[cur_fline], bracket) == NULL) { print_statusline("No bracket in top line"); |