author | Michael Gerdts <mike.gerdts@oracle.com> |
Thu, 21 Aug 2014 15:36:47 -0700 | |
branch | s11-update |
changeset 3422 | 02c11a9bd1ed |
permissions | -rw-r--r-- |
3422
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
1 |
avoid inflateReset2 so that zlib 1.2.3 may be used - developed by Oracle |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
2 |
not submitted upstream |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
3 |
|
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
4 |
diff -r 510b1b710ac5 pigz.c |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
5 |
--- a/pigz.c |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/pigz.c |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
7 |
@@ -3352,7 +3352,7 @@ |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
8 |
/* got a job -- buffers have all been allocated to the right size. |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
9 |
deflate and verify the checksum. */ |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
10 |
Trace(("-- uncompressing #%ld", job->seq)); |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
11 |
- if (inflateReset2(&strm, -15) != Z_OK) |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
12 |
+ if (inflateEnd(&strm) != Z_OK || inflateInit2(&strm, -15) != Z_OK) |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
13 |
bail("stream reset failed: ", strm.msg); |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
14 |
strm.next_in = job->in->buf; |
02c11a9bd1ed
19612384 pigz needs parallel uncompress
Michael Gerdts <mike.gerdts@oracle.com>
parents:
diff
changeset
|
15 |
strm.avail_in = job->in->len; |