From ce31004f205bb5dcb5ba6766b86009ffbcc90f00 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Mon, 11 Sep 2017 13:12:52 -0700 Subject: [PATCH] fix following suggestions by @terrelln --- doc/zstd_manual.html | 2 +- lib/decompress/zstd_decompress.c | 1 - lib/zstd.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/zstd_manual.html b/doc/zstd_manual.html index c1c6d41a4..1c298726c 100644 --- a/doc/zstd_manual.html +++ b/doc/zstd_manual.html @@ -779,7 +779,7 @@ typedef struct { unsigned checksumFlag; } ZSTD_frameHeader; size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize); /**< doesn't consume input */ -size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize); +size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize); /**< when frame content size is not known, pass in frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN */ 
typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e;

diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c index 5158d3f32..aa4c58d91 100644 --- a/lib/decompress/zstd_decompress.c +++ b/lib/decompress/zstd_decompress.c @@ -2249,7 +2249,6 @@ size_t ZSTD_estimateDStreamSize(size_t windowSize) { size_t const blockSize = MIN(windowSize, ZSTD_BLOCKSIZE_MAX); size_t const inBuffSize = blockSize; /* no block can be larger */ - //size_t const outBuffSize = windowSize + blockSize + (WILDCOPY_OVERLENGTH * 2); size_t const outBuffSize = ZSTD_decodingBufferSize_min(windowSize, ZSTD_CONTENTSIZE_UNKNOWN); return ZSTD_estimateDCtxSize() + inBuffSize + outBuffSize; } diff --git a/lib/zstd.h b/lib/zstd.h index e97782c38..7695776f5 100644 --- a/lib/zstd.h +++ b/lib/zstd.h @@ -889,7 +889,7 @@ typedef struct { unsigned checksumFlag; } ZSTD_frameHeader; ZSTDLIB_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize); /**< doesn't consume input */ -ZSTDLIB_API size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize); +ZSTDLIB_API size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize); /**< when frame content size is not known, pass in frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN */ ZSTDLIB_API size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx); ZSTDLIB_API size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);