From 6b06cb80be64fcf207bee734cc678c25434ed1a4 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 15 May 2008 21:30:45 +0000 Subject: 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 --- archival/libunarchive/decompress_bunzip2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'archival/libunarchive/decompress_bunzip2.c') diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index c1b12732c..f74fdf1ad 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c @@ -103,7 +103,7 @@ static unsigned get_bits(bunzip_data *bd, int bits_wanted) /* If we need to get more data from the byte buffer, do so. (Loop getting one byte at a time to enforce endianness and avoid unaligned access.) */ - while (bd->inbufBitCount < bits_wanted) { + while ((int)(bd->inbufBitCount) < bits_wanted) { /* If we need to read more data from file into byte buffer, do so */ @@ -172,7 +172,7 @@ static int get_next_block(bunzip_data *bd) if (get_bits(bd, 1)) return RETVAL_OBSOLETE_INPUT; origPtr = get_bits(bd, 24); - if (origPtr > dbufSize) return RETVAL_DATA_ERROR; + if ((int)origPtr > dbufSize) return RETVAL_DATA_ERROR; /* mapping table: if some byte values are never used (encoding things like ascii text), the compression code removes the gaps to have fewer @@ -368,7 +368,7 @@ static int get_next_block(bunzip_data *bd) j = get_bits(bd, hufGroup->maxLen); */ - while (bd->inbufBitCount < hufGroup->maxLen) { + while ((int)(bd->inbufBitCount) < hufGroup->maxLen) { if (bd->inbufPos == bd->inbufCount) { j = get_bits(bd, hufGroup->maxLen); goto got_huff_bits; @@ -505,7 +505,7 @@ static int get_next_block(bunzip_data *bd) it doesn't qualify as a run (hence writeRunCountdown=5). */ if (dbufCount) { - if (origPtr >= dbufCount) return RETVAL_DATA_ERROR; + if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR; bd->writePos = dbuf[origPtr]; bd->writeCurrent = (unsigned char)(bd->writePos & 0xff); bd->writePos >>= 8; -- cgit v1.2.3