|
 |
2fd9fe |
---
|
|
|
2fd9fe |
dfltcc.c | 14 ++++++++------
|
|
|
2fd9fe |
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
2fd9fe |
|
|
|
2fd9fe |
diff --git a/dfltcc.c b/dfltcc.c
|
|
|
2fd9fe |
index 86aa56e..3a5b92d 100644
|
|
|
2fd9fe |
--- a/dfltcc.c
|
|
|
2fd9fe |
+++ b/dfltcc.c
|
|
|
2fd9fe |
@@ -242,10 +242,8 @@ dfltcc_gdht (struct dfltcc_param_v0 *param)
|
|
|
2fd9fe |
dfltcc (DFLTCC_GDHT, param, NULL, NULL, &next_in, &avail_in, NULL);
|
|
|
2fd9fe |
}
|
|
|
2fd9fe |
|
|
|
2fd9fe |
-static off_t total_in;
|
|
|
2fd9fe |
-
|
|
|
2fd9fe |
static dfltcc_cc
|
|
|
2fd9fe |
-dfltcc_cmpr_xpnd (struct dfltcc_param_v0 *param, int fn)
|
|
|
2fd9fe |
+dfltcc_cmpr_xpnd (struct dfltcc_param_v0 *param, int fn, off_t *total_in)
|
|
|
2fd9fe |
{
|
|
|
2fd9fe |
uch *next_out = outbuf + outcnt;
|
|
|
2fd9fe |
size_t avail_out = OUTBUFSIZ - outcnt;
|
|
|
2fd9fe |
@@ -257,7 +255,7 @@ dfltcc_cmpr_xpnd (struct dfltcc_param_v0 *param, int fn)
|
|
|
2fd9fe |
window);
|
|
|
2fd9fe |
off_t consumed_in = next_in - (inbuf + inptr);
|
|
|
2fd9fe |
inptr += consumed_in;
|
|
|
2fd9fe |
- total_in += consumed_in;
|
|
|
2fd9fe |
+ *total_in += consumed_in;
|
|
|
2fd9fe |
outcnt += ((OUTBUFSIZ - outcnt) - avail_out);
|
|
|
2fd9fe |
return cc;
|
|
|
2fd9fe |
}
|
|
|
2fd9fe |
@@ -349,6 +347,7 @@ dfltcc_deflate (int pack_level)
|
|
|
2fd9fe |
|
|
|
2fd9fe |
union aligned_dfltcc_param_v0 ctx_v0;
|
|
|
2fd9fe |
struct dfltcc_param_v0 *param = init_param (&ctx_v0);
|
|
|
2fd9fe |
+ off_t total_in = 0;
|
|
|
2fd9fe |
|
|
|
2fd9fe |
/* Compress ifd into ofd in a loop. */
|
|
|
2fd9fe |
while (true)
|
|
|
2fd9fe |
@@ -398,7 +397,8 @@ dfltcc_deflate (int pack_level)
|
|
|
2fd9fe |
}
|
|
|
2fd9fe |
|
|
|
2fd9fe |
/* Compress inbuf into outbuf. */
|
|
|
2fd9fe |
- while (dfltcc_cmpr_xpnd (param, DFLTCC_CMPR) == DFLTCC_CC_AGAIN)
|
|
|
2fd9fe |
+ while (dfltcc_cmpr_xpnd (param, DFLTCC_CMPR, &total_in)
|
|
|
2fd9fe |
+ == DFLTCC_CC_AGAIN)
|
|
|
2fd9fe |
;
|
|
|
2fd9fe |
|
|
|
2fd9fe |
/* Unmask the input data. */
|
|
|
2fd9fe |
@@ -427,6 +427,7 @@ dfltcc_inflate (void)
|
|
|
2fd9fe |
|
|
|
2fd9fe |
union aligned_dfltcc_param_v0 ctx_v0;
|
|
|
2fd9fe |
struct dfltcc_param_v0 *param = init_param (&ctx_v0);
|
|
|
2fd9fe |
+ off_t total_in = 0;
|
|
|
2fd9fe |
|
|
|
2fd9fe |
/* Decompress ifd into ofd in a loop. */
|
|
|
2fd9fe |
while (true)
|
|
|
2fd9fe |
@@ -446,7 +447,8 @@ dfltcc_inflate (void)
|
|
|
2fd9fe |
|
|
|
2fd9fe |
/* Decompress inbuf into outbuf. */
|
|
|
2fd9fe |
dfltcc_cc cc;
|
|
|
2fd9fe |
- while ((cc = dfltcc_cmpr_xpnd (param, DFLTCC_XPND)) == DFLTCC_CC_AGAIN)
|
|
|
2fd9fe |
+ while ((cc = dfltcc_cmpr_xpnd (param, DFLTCC_XPND, &total_in))
|
|
|
2fd9fe |
+ == DFLTCC_CC_AGAIN)
|
|
|
2fd9fe |
;
|
|
|
2fd9fe |
if (cc == DFLTCC_CC_OK)
|
|
|
2fd9fe |
{
|
|
|
2fd9fe |
--
|
|
|
2fd9fe |
2.25.4
|