diff options
Diffstat (limited to 'zlib/inffast.c')
| -rw-r--r-- | zlib/inffast.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/zlib/inffast.c b/zlib/inffast.c index bbee92ed1e6..a18de8abdc5 100644 --- a/zlib/inffast.c +++ b/zlib/inffast.c @@ -64,9 +64,7 @@ requires strm->avail_out >= 258 for each loop to avoid checking for output space. */ -void inflate_fast(strm, start) -z_streamp strm; -unsigned start; /* inflate()'s starting value for strm->avail_out */ +void inflate_fast(z_streamp strm, unsigned start) /* inflate()'s starting value for strm->avail_out */ { struct inflate_state FAR *state; unsigned char FAR *in; /* local strm->next_in */ @@ -87,7 +85,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ code const FAR *dcode; /* local strm->distcode */ unsigned lmask; /* mask for first level of length codes */ unsigned dmask; /* mask for first level of distance codes */ - code this; /* retrieved table entry */ + code it; /* retrieved table entry */ unsigned op; /* code bits, operation, extra bits, or */ /* window position, window bytes to copy */ unsigned len; /* match length, unused bytes */ @@ -124,20 +122,20 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold += (unsigned long)(PUP(in)) << bits; bits += 8; } - this = lcode[hold & lmask]; + it = lcode[hold & lmask]; dolen: - op = (unsigned)(this.bits); + op = (unsigned)(it.bits); hold >>= op; bits -= op; - op = (unsigned)(this.op); + op = (unsigned)(it.op); if (op == 0) { /* literal */ - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + Tracevv((stderr, it.val >= 0x20 && it.val < 0x7f ? "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); - PUP(out) = (unsigned char)(this.val); + "inflate: literal 0x%02x\n", it.val)); + PUP(out) = (unsigned char)(it.val); } else if (op & 16) { /* length base */ - len = (unsigned)(this.val); + len = (unsigned)(it.val); op &= 15; /* number of extra bits */ if (op) { if (bits < op) { @@ -155,14 +153,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold += (unsigned long)(PUP(in)) << bits; bits += 8; } - this = dcode[hold & dmask]; + it = dcode[hold & dmask]; dodist: - op = (unsigned)(this.bits); + op = (unsigned)(it.bits); hold >>= op; bits -= op; - op = (unsigned)(this.op); + op = (unsigned)(it.op); if (op & 16) { /* distance base */ - dist = (unsigned)(this.val); + dist = (unsigned)(it.val); op &= 15; /* number of extra bits */ if (bits < op) { hold += (unsigned long)(PUP(in)) << bits; @@ -259,7 +257,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } } else if ((op & 64) == 0) { /* 2nd level distance code */ - this = dcode[this.val + (hold & ((1U << op) - 1))]; + it = dcode[it.val + (hold & ((1U << op) - 1))]; goto dodist; } else { @@ -269,7 +267,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } } else if ((op & 64) == 0) { /* 2nd level length code */ - this = lcode[this.val + (hold & ((1U << op) - 1))]; + it = lcode[it.val + (hold & ((1U << op) - 1))]; goto dolen; } else if (op & 32) { /* end-of-block */ |