diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 8fd10a68..c3d317d2 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -3403,7 +3403,7 @@ static size_t ZSTD_initCDict_internal( DEBUGLOG(3, "ZSTD_initCDict_internal (dictContentType:%u)", (unsigned)dictContentType); assert(!ZSTD_checkCParams(cParams)); cdict->matchState.cParams = cParams; - cdict->matchState.enableDedicatedDictSearch = params.enableDedicatedDictSearch; + cdict->matchState.dedicatedDictSearch = params.enableDedicatedDictSearch; if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dictBuffer) || (!dictSize)) { cdict->dictContent = dictBuffer; } else { @@ -3512,9 +3512,9 @@ ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced2(const void* dict, size_t dict ZSTD_CCtx_params* cctxParams, ZSTD_customMem customMem) { - int const enableDedicatedDictSearch = cctxParams->enableDedicatedDictSearch && + int const dedicatedDictSearch = cctxParams->enableDedicatedDictSearch && ZSTD_dedicatedDictSearch_isSupported(cctxParams->compressionLevel, dictSize); - if (!enableDedicatedDictSearch) { + if (!dedicatedDictSearch) { ZSTD_compressionParameters cParams = ZSTD_getCParams_internal( cctxParams->compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize); return ZSTD_createCDict_advanced(dict, dictSize, diff --git a/lib/compress/zstd_compress_internal.h b/lib/compress/zstd_compress_internal.h index 8f4d2c55..7b827275 100644 --- a/lib/compress/zstd_compress_internal.h +++ b/lib/compress/zstd_compress_internal.h @@ -153,7 +153,9 @@ struct ZSTD_matchState_t { U32* hashTable; U32* hashTable3; U32* chainTable; - int enableDedicatedDictSearch; + int dedicatedDictSearch; /* Indicates whether this matchState is using the + * dedicated dictionary search structure. + */ optState_t opt; /* optimal parser state */ const ZSTD_matchState_t* dictMatchState; ZSTD_compressionParameters cParams; @@ -768,7 +770,7 @@ MEM_STATIC ZSTD_dictMode_e ZSTD_matchState_dictMode(const ZSTD_matchState_t *ms) return ZSTD_window_hasExtDict(ms->window) ? ZSTD_extDict : ms->dictMatchState != NULL ? - (ms->dictMatchState->enableDedicatedDictSearch ? ZSTD_dedicatedDictSearch : ZSTD_dictMatchState) : + (ms->dictMatchState->dedicatedDictSearch ? ZSTD_dedicatedDictSearch : ZSTD_dictMatchState) : ZSTD_noDict; }