Date: Sun, 25 Aug 2019 07:50:45 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351477 - head/sys/kern Message-ID: <201908250750.x7P7ojPg007108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Sun Aug 25 07:50:44 2019 New Revision: 351477 URL: https://svnweb.freebsd.org/changeset/base/351477 Log: 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 Modified: head/sys/kern/subr_compressor.c Modified: head/sys/kern/subr_compressor.c ============================================================================== --- head/sys/kern/subr_compressor.c Sun Aug 25 07:06:51 2019 (r351476) +++ head/sys/kern/subr_compressor.c Sun Aug 25 07:50:44 2019 (r351477) @@ -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, compres 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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908250750.x7P7ojPg007108>