diff options
| author | Xin LI <delphij@FreeBSD.org> | 2019-08-25 07:50:44 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2019-08-25 07:50:44 +0000 |
| commit | 4e8671dd78cc77b31c598e83354fa6722acd4e3f (patch) | |
| tree | 6ef6839a77a736fb9a9ea55dc2226d1c8d0d38bb | |
| parent | 83ea714f4fca050f863279a5e6e4266d09dcaa93 (diff) | |
| download | src-4e8671dd78cc77b31c598e83354fa6722acd4e3f.tar.gz src-4e8671dd78cc77b31c598e83354fa6722acd4e3f.zip | |
GZIO: Update to use zlib 1.2.11.
PR: 229763
Submitted by: Yoshihiro Ota <ota j email ne jp>
Differential Revision: https://reviews.freebsd.org/D21408
Notes
Notes:
svn path=/head/; revision=351477
| -rw-r--r-- | sys/kern/subr_compressor.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/subr_compressor.c b/sys/kern/subr_compressor.c index 03dd295388ad..5950ade1d3ca 100644 --- a/sys/kern/subr_compressor.c +++ b/sys/kern/subr_compressor.c @@ -66,8 +66,7 @@ SET_DECLARE(compressors, struct compressor_methods); #ifdef GZIO -#include <sys/gsb_crc32.h> -#include <sys/zutil.h> +#include <contrib/zlib/zutil.h> struct gz_stream { uint8_t *gz_buffer; /* output buffer */ @@ -141,7 +140,7 @@ gz_reset(void *stream) s = stream; s->gz_off = 0; - s->gz_crc = ~0U; + s->gz_crc = crc32(0L, Z_NULL, 0); (void)deflateReset(&s->gz_stream); s->gz_stream.avail_out = s->gz_bufsz; @@ -173,9 +172,8 @@ gz_write(void *stream, void *data, size_t len, compressor_cb_t cb, if (len > 0) { s->gz_stream.avail_in = len; s->gz_stream.next_in = data; - s->gz_crc = crc32_raw(data, len, s->gz_crc); - } else - s->gz_crc ^= ~0U; + s->gz_crc = crc32(s->gz_crc, data, len); + } error = 0; do { |