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 /archival/libunarchive | |
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 'archival/libunarchive')
-rw-r--r-- | archival/libunarchive/archive_xread_all_eof.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 8 | ||||
-rw-r--r-- | archival/libunarchive/decompress_unlzma.c | 6 | ||||
-rw-r--r-- | archival/libunarchive/decompress_unzip.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c index 7e082ab..c93dfa2 100644 --- a/archival/libunarchive/archive_xread_all_eof.c +++ b/archival/libunarchive/archive_xread_all_eof.c @@ -12,7 +12,7 @@ ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, ssize_t size; size = full_read(archive_handle->src_fd, buf, count); - if (size != 0 && size != count) { + if (size != 0 && size != (ssize_t)count) { bb_error_msg_and_die("short read: %u of %u", (unsigned)size, (unsigned)count); } diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index c1b1273..f74fdf1 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; diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c index 5fb7eae..c320400 100644 --- a/archival/libunarchive/decompress_unlzma.c +++ b/archival/libunarchive/decompress_unlzma.c @@ -329,7 +329,7 @@ unpack_lzma_stream(int src_fd, int dst_fd) if (buffer_pos == header.dict_size) { buffer_pos = 0; global_pos += header.dict_size; - if (full_write(dst_fd, buffer, header.dict_size) != header.dict_size) + if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size) goto bad; USE_DESKTOP(total_written += header.dict_size;) } @@ -480,7 +480,7 @@ unpack_lzma_stream(int src_fd, int dst_fd) if (buffer_pos == header.dict_size) { buffer_pos = 0; global_pos += header.dict_size; - if (full_write(dst_fd, buffer, header.dict_size) != header.dict_size) + if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size) goto bad; USE_DESKTOP(total_written += header.dict_size;) } @@ -489,7 +489,7 @@ unpack_lzma_stream(int src_fd, int dst_fd) } } - if (full_write(dst_fd, buffer, buffer_pos) != buffer_pos) { + if (full_write(dst_fd, buffer, buffer_pos) != (ssize_t)buffer_pos) { bad: rc_free(rc); return -1; diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index a764fbc..9036fab 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -922,7 +922,7 @@ static int inflate_block(STATE_PARAM smallint *e) /* Two callsites, both in inflate_get_next_window */ static void calculate_gunzip_crc(STATE_PARAM_ONLY) { - int n; + unsigned n; for (n = 0; n < gunzip_outbuf_count; n++) { gunzip_crc = gunzip_crc_table[((int) gunzip_crc ^ (gunzip_window[n])) & 0xff] ^ (gunzip_crc >> 8); } @@ -1003,7 +1003,7 @@ inflate_unzip_internal(STATE_PARAM int in, int out) while (1) { int r = inflate_get_next_window(PASS_STATE_ONLY); nwrote = full_write(out, gunzip_window, gunzip_outbuf_count); - if (nwrote != gunzip_outbuf_count) { + if (nwrote != (ssize_t)gunzip_outbuf_count) { bb_perror_msg("write"); n = -1; goto ret; @@ -1064,7 +1064,7 @@ static int top_up(STATE_PARAM unsigned n) { int count = bytebuffer_size - bytebuffer_offset; - if (count < n) { + if (count < (int)n) { memmove(bytebuffer, &bytebuffer[bytebuffer_offset], count); bytebuffer_offset = 0; bytebuffer_size = full_read(gunzip_src_fd, &bytebuffer[count], bytebuffer_max - count); |