diff options
| author | Eric Andersen | 2006-01-30 17:27:00 +0000 |
|---|---|---|
| committer | Eric Andersen | 2006-01-30 17:27:00 +0000 |
| commit | f55289f4b994afa08444d9204c8ed5ebb036a4ee (patch) | |
| tree | d065ac371da63a2361a14dba3ea7487c8a649645 | |
| parent | 20f40000864609866b51624351581d067b18469c (diff) | |
| download | busybox-f55289f4b994afa08444d9204c8ed5ebb036a4ee.zip busybox-f55289f4b994afa08444d9204c8ed5ebb036a4ee.tar.gz | |
fixup a few types to prevent gcc (rightfully) whining about mixing
signed and unsigned, unmatches pointer target types, etc
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 4c1d178..1b82542 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -92,7 +92,7 @@ static unsigned int gunzip_outbuf_count; /* bytes in output buffer */ /* gunzip_window size--must be a power of two, and * at least 32K for zip's deflate method */ -static const int gunzip_wsize = 0x8000; +static const unsigned int gunzip_wsize = 0x8000; static unsigned char *gunzip_window; static unsigned int *gunzip_crc_table; @@ -234,7 +234,7 @@ static int huft_free(huft_t * t) */ int huft_build(unsigned int *b, const unsigned int n, const unsigned int s, const unsigned short *d, - const unsigned char *e, huft_t ** t, int *m) + const unsigned char *e, huft_t ** t, unsigned int *m) { unsigned a; /* counter for codes of length k */ unsigned c[BMAX + 1]; /* bit length count table */ @@ -539,7 +539,7 @@ do_copy: do { static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup) { - static int n, b_stored, k_stored, w; + static unsigned int n, b_stored, k_stored, w; if (setup) { n = my_n; b_stored = my_b_stored; @@ -552,7 +552,7 @@ static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup) while (n--) { b_stored = fill_bitbuffer(b_stored, &k_stored, 8); gunzip_window[w++] = (unsigned char) b_stored; - if (w == (unsigned int) gunzip_wsize) { + if (w == gunzip_wsize) { gunzip_outbuf_count = (w); //flush_gunzip_window(); w = 0; |