VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/zlib/inffast.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/zlib/inffast.c')
-rw-r--r--src/Common/zlib/inffast.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Common/zlib/inffast.c b/src/Common/zlib/inffast.c
index 0dbd1dbc..1fec7f36 100644
--- a/src/Common/zlib/inffast.c
+++ b/src/Common/zlib/inffast.c
@@ -72,3 +72,3 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
unsigned dmask; /* mask for first level of distance codes */
- code here; /* retrieved table entry */
+ code const *here; /* retrieved table entry */
unsigned op; /* code bits, operation, extra bits, or */
@@ -109,16 +109,16 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
}
- here = lcode[hold & lmask];
+ here = lcode + (hold & lmask);
dolen:
- op = (unsigned)(here.bits);
+ op = (unsigned)(here->bits);
hold >>= op;
bits -= op;
- op = (unsigned)(here.op);
+ op = (unsigned)(here->op);
if (op == 0) { /* literal */
- Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+ Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
"inflate: literal '%c'\n" :
- "inflate: literal 0x%02x\n", here.val));
- *out++ = (unsigned char)(here.val);
+ "inflate: literal 0x%02x\n", here->val));
+ *out++ = (unsigned char)(here->val);
}
else if (op & 16) { /* length base */
- len = (unsigned)(here.val);
+ len = (unsigned)(here->val);
op &= 15; /* number of extra bits */
@@ -140,10 +140,10 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
}
- here = dcode[hold & dmask];
+ here = dcode + (hold & dmask);
dodist:
- op = (unsigned)(here.bits);
+ op = (unsigned)(here->bits);
hold >>= op;
bits -= op;
- op = (unsigned)(here.op);
+ op = (unsigned)(here->op);
if (op & 16) { /* distance base */
- dist = (unsigned)(here.val);
+ dist = (unsigned)(here->val);
op &= 15; /* number of extra bits */
@@ -266,3 +266,3 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
else if ((op & 64) == 0) { /* 2nd level distance code */
- here = dcode[here.val + (hold & ((1U << op) - 1))];
+ here = dcode + here->val + (hold & ((1U << op) - 1));
goto dodist;
@@ -276,3 +276,3 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
else if ((op & 64) == 0) { /* 2nd level length code */
- here = lcode[here.val + (hold & ((1U << op) - 1))];
+ here = lcode + here->val + (hold & ((1U << op) - 1));
goto dolen;