aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-30 17:27:00 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-30 17:27:00 +0000
commit840f2f9e34480f04a53dca599b7ae2d818e62476 (patch)
treed065ac371da63a2361a14dba3ea7487c8a649645
parente3206585f41ad674d5d6f9f04f4cb50efdc21119 (diff)
downloadbusybox-w32-840f2f9e34480f04a53dca599b7ae2d818e62476.tar.gz
busybox-w32-840f2f9e34480f04a53dca599b7ae2d818e62476.tar.bz2
busybox-w32-840f2f9e34480f04a53dca599b7ae2d818e62476.zip
fixup a few types to prevent gcc (rightfully) whining about mixing
signed and unsigned, unmatches pointer target types, etc git-svn-id: svn://busybox.net/trunk/busybox@13719 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--archival/libunarchive/decompress_unzip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 4c1d1780e..1b82542fe 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 */
92 92
93/* gunzip_window size--must be a power of two, and 93/* gunzip_window size--must be a power of two, and
94 * at least 32K for zip's deflate method */ 94 * at least 32K for zip's deflate method */
95static const int gunzip_wsize = 0x8000; 95static const unsigned int gunzip_wsize = 0x8000;
96static unsigned char *gunzip_window; 96static unsigned char *gunzip_window;
97 97
98static unsigned int *gunzip_crc_table; 98static unsigned int *gunzip_crc_table;
@@ -234,7 +234,7 @@ static int huft_free(huft_t * t)
234 */ 234 */
235int huft_build(unsigned int *b, const unsigned int n, 235int huft_build(unsigned int *b, const unsigned int n,
236 const unsigned int s, const unsigned short *d, 236 const unsigned int s, const unsigned short *d,
237 const unsigned char *e, huft_t ** t, int *m) 237 const unsigned char *e, huft_t ** t, unsigned int *m)
238{ 238{
239 unsigned a; /* counter for codes of length k */ 239 unsigned a; /* counter for codes of length k */
240 unsigned c[BMAX + 1]; /* bit length count table */ 240 unsigned c[BMAX + 1]; /* bit length count table */
@@ -539,7 +539,7 @@ do_copy: do {
539 539
540static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup) 540static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup)
541{ 541{
542 static int n, b_stored, k_stored, w; 542 static unsigned int n, b_stored, k_stored, w;
543 if (setup) { 543 if (setup) {
544 n = my_n; 544 n = my_n;
545 b_stored = my_b_stored; 545 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)
552 while (n--) { 552 while (n--) {
553 b_stored = fill_bitbuffer(b_stored, &k_stored, 8); 553 b_stored = fill_bitbuffer(b_stored, &k_stored, 8);
554 gunzip_window[w++] = (unsigned char) b_stored; 554 gunzip_window[w++] = (unsigned char) b_stored;
555 if (w == (unsigned int) gunzip_wsize) { 555 if (w == gunzip_wsize) {
556 gunzip_outbuf_count = (w); 556 gunzip_outbuf_count = (w);
557 //flush_gunzip_window(); 557 //flush_gunzip_window();
558 w = 0; 558 w = 0;