X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libbb%2Funzip.c;h=08c17d4a2927877a7ad10f85b2791eafd8eda4e7;hp=954ee61a8b8882e4768fc2c610093ba141c86267;hb=e5cfa6dc4794e0a5bca36cabcd12a877454478db;hpb=bb61b4e2022bea1f8728d18dac18239ed6931826 diff --git a/libbb/unzip.c b/libbb/unzip.c index 954ee61..08c17d4 100644 --- a/libbb/unzip.c +++ b/libbb/unzip.c @@ -196,16 +196,16 @@ static int huft_build(unsigned int *b, const unsigned int n, const unsigned int unsigned f; /* i repeats in table every f entries */ int g; /* maximum code length */ int h; /* table level */ - register unsigned i; /* counter, current code */ - register unsigned j; /* counter */ - register int k; /* number of bits in current code */ + unsigned i; /* counter, current code */ + unsigned j; /* counter */ + int k; /* number of bits in current code */ int l; /* bits per table (returned in m) */ - register unsigned *p; /* pointer into c[], b[], or v[] */ - register huft_t *q; /* points to current table */ + unsigned *p; /* pointer into c[], b[], or v[] */ + huft_t *q; /* points to current table */ huft_t r; /* table entry for structure assignment */ huft_t *u[BMAX]; /* table stack */ unsigned v[N_MAX]; /* values in order of bit length */ - register int w; /* bits before this table == (l * h) */ + int w; /* bits before this table == (l * h) */ unsigned x[BMAX + 1]; /* bit offsets, then code stack */ unsigned *xp; /* pointer into x */ int y; /* number of dummy codes added */ @@ -363,13 +363,13 @@ static int huft_build(unsigned int *b, const unsigned int n, const unsigned int */ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd) { - register unsigned long e; /* table entry flag/number of extra bits */ + unsigned long e; /* table entry flag/number of extra bits */ unsigned long n, d; /* length and index for copy */ unsigned long w; /* current window position */ huft_t *t; /* pointer to table entry */ unsigned ml, md; /* masks for bl and bd bits */ - register unsigned long b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ + unsigned long b; /* bit buffer */ + unsigned k; /* number of bits in bit buffer */ /* make local copies of globals */ b = bb; /* initialize bit buffer */ @@ -490,8 +490,8 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd) static int inflate_block(int *e) { unsigned t; /* block type */ - register unsigned long b; /* bit buffer */ - register unsigned k; /* number of bits in bit buffer */ + unsigned long b; /* bit buffer */ + unsigned k; /* number of bits in bit buffer */ static unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 @@ -544,8 +544,8 @@ static int inflate_block(int *e) { unsigned long n; /* number of bytes in block */ unsigned long w; /* current window position */ - register unsigned long b_stored; /* bit buffer */ - register unsigned long k_stored; /* number of bits in bit buffer */ + unsigned long b_stored; /* bit buffer */ + unsigned long k_stored; /* number of bits in bit buffer */ /* make local copies of globals */ b_stored = bb; /* initialize bit buffer */ @@ -670,8 +670,8 @@ static int inflate_block(int *e) unsigned nd; /* number of distance codes */ unsigned ll[286 + 30]; /* literal/length and distance code lengths */ - register unsigned long b_dynamic; /* bit buffer */ - register unsigned k_dynamic; /* number of bits in bit buffer */ + unsigned long b_dynamic; /* bit buffer */ + unsigned k_dynamic; /* number of bits in bit buffer */ /* make local bit buffer */ b_dynamic = bb;