emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup a few types to prevent gcc (rightfully) whining about mixing

Browse Source 
signed and unsigned, unmatches pointer target types, etc
This commit is contained in:
Eric Andersen 2006-01-30 17:27:00 +00:00
parent 20f4000086
commit f55289f4b9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archival/libunarchive/decompress_unzip.c
View File

@ -92,7 +92,7 @@ static unsigned int gunzip_outbuf_count; /* bytes in output buffer */
/* gunzip_window size--must be a power of two, and /* gunzip_window size--must be a power of two, and
* at least 32K for zip's deflate method */ * 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 char *gunzip_window;
static unsigned int *gunzip_crc_table; 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, int huft_build(unsigned int *b, const unsigned int n,
const unsigned int s, const unsigned short *d, 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 a; /* counter for codes of length k */
unsigned c[BMAX + 1]; /* bit length count table */ 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 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) { if (setup) {
n = my_n; n = my_n;
b_stored = my_b_stored; 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--) { while (n--) {
b_stored = fill_bitbuffer(b_stored, &k_stored, 8); b_stored = fill_bitbuffer(b_stored, &k_stored, 8);
gunzip_window[w++] = (unsigned char) b_stored; gunzip_window[w++] = (unsigned char) b_stored;
if (w == (unsigned int) gunzip_wsize) { if (w == gunzip_wsize) {
gunzip_outbuf_count = (w); gunzip_outbuf_count = (w);
//flush_gunzip_window(); //flush_gunzip_window();
w = 0; w = 0;