From: senhuang42 Date: Mon, 2 Nov 2020 15:59:06 +0000 (-0500) Subject: Revert unnecessary seqCollector adjustment X-Git-Tag: v1.4.7~34^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6178f837f7ea421056662ba71e8b3b88ae0cccd;p=thirdparty%2Fzstd.git Revert unnecessary seqCollector adjustment --- diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 7357a70a2..e92f3e378 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -2562,7 +2562,6 @@ size_t ZSTD_getSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs, seqCollector.seqStart = outSeqs; seqCollector.seqIndex = 0; seqCollector.maxSequences = outSeqsSize; - seqCollector.format = format; zc->seqCollector = seqCollector; ZSTD_compress2(zc, dst, dstCapacity, src, srcSize); @@ -2586,7 +2585,7 @@ size_t ZSTD_getSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs, } zc->seqCollector.seqIndex = totalSeqs; } - + return zc->seqCollector.seqIndex; } diff --git a/lib/compress/zstd_compress_internal.h b/lib/compress/zstd_compress_internal.h index e11f1dbd6..3ff318d53 100644 --- a/lib/compress/zstd_compress_internal.h +++ b/lib/compress/zstd_compress_internal.h @@ -206,7 +206,6 @@ typedef struct { ZSTD_Sequence* seqStart; size_t seqIndex; size_t maxSequences; - ZSTD_sequenceFormat_e format; } SeqCollector; struct ZSTD_CCtx_params_s {