From: Yann Collet Date: Tue, 18 Apr 2017 21:08:50 +0000 (-0700) Subject: Changed ZSTD_resetCCtx_advanced() into ZSTD_resetCCtx_internal() X-Git-Tag: v1.2.0^2~34^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30fb499208e650ba3e5f28bafde788fda474dfff;p=thirdparty%2Fzstd.git Changed ZSTD_resetCCtx_advanced() into ZSTD_resetCCtx_internal() for naming consistency : _advanced() can be invoked while _internal() are strictly static --- diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 33d4ab005..9328b7c40 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -257,9 +257,9 @@ static size_t ZSTD_continueCCtx(ZSTD_CCtx* cctx, ZSTD_parameters params, U64 fra typedef enum { ZSTDcrp_continue, ZSTDcrp_noMemset, ZSTDcrp_fullReset } ZSTD_compResetPolicy_e; -/*! ZSTD_resetCCtx_advanced() : +/*! ZSTD_resetCCtx_internal() : note : `params` must be validated */ -static size_t ZSTD_resetCCtx_advanced (ZSTD_CCtx* zc, +static size_t ZSTD_resetCCtx_internal (ZSTD_CCtx* zc, ZSTD_parameters params, U64 frameContentSize, ZSTD_compResetPolicy_e const crp) { @@ -365,7 +365,7 @@ size_t ZSTD_copyCCtx(ZSTD_CCtx* dstCCtx, const ZSTD_CCtx* srcCCtx, unsigned long memcpy(&dstCCtx->customMem, &srcCCtx->customMem, sizeof(ZSTD_customMem)); { ZSTD_parameters params = srcCCtx->params; params.fParams.contentSizeFlag = (pledgedSrcSize > 0); - ZSTD_resetCCtx_advanced(dstCCtx, params, pledgedSrcSize, ZSTDcrp_noMemset); + ZSTD_resetCCtx_internal(dstCCtx, params, pledgedSrcSize, ZSTDcrp_noMemset); } /* copy tables */ @@ -2694,7 +2694,7 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx, { ZSTD_compResetPolicy_e const crp = dictSize ? ZSTDcrp_fullReset : ZSTDcrp_continue; assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams))); - CHECK_F(ZSTD_resetCCtx_advanced(cctx, params, pledgedSrcSize, crp)); + CHECK_F(ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize, crp)); return ZSTD_compress_insertDictionary(cctx, dict, dictSize); }