From: W. Felix Handte <w@felixhandte.com>
Date: Mon, 27 Aug 2018 22:23:27 +0000 (-0700)
Subject: Bump Split Log Support to ZSTD_dfast
X-Git-Tag: v1.3.6^2~10^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a232b3bb7c0acb80b4ec4e25d05d2146c52999e0;p=thirdparty%2Fzstd.git

Bump Split Log Support to ZSTD_dfast
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 4d54772a0..8fa42bab8 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -1332,8 +1332,8 @@ static int ZSTD_shouldAttachDict(ZSTD_CCtx* cctx,
         && params.attachDictPref != ZSTD_dictForceCopy
         && !params.forceWindow /* dictMatchState isn't correctly
                                 * handled in _enforceMaxDist */
-        && ( (cdict->matchState.cParams.strategy <= ZSTD_fast)
-          || (cdict->matchState.cParams.strategy > ZSTD_fast &&
+        && ( (cdict->matchState.cParams.strategy <= ZSTD_dfast)
+          || (cdict->matchState.cParams.strategy > ZSTD_dfast &&
               ZSTD_equivalentCParams(cctx->appliedParams.cParams,
                                      cdict->matchState.cParams)));
 }
@@ -1351,7 +1351,7 @@ static size_t ZSTD_resetCCtx_byAttachingCDict(ZSTD_CCtx* cctx,
         /* Copy only compression parameters related to tables. */
         params.cParams = *cdict_cParams;
         params.cParams.windowLog = windowLog;
-        if (params.cParams.strategy <= ZSTD_fast) {
+        if (params.cParams.strategy <= ZSTD_dfast) {
             DEBUGLOG(4, "Overriding hashLog from %d to %d", params.cParams.hashLog, cctx->requestedParams.cParams.hashLog);
             DEBUGLOG(4, "Overriding chainLog from %d to %d", params.cParams.chainLog, cctx->requestedParams.cParams.chainLog);
             if (cctx->requestedParams.cParams.hashLog)
@@ -1362,7 +1362,7 @@ static size_t ZSTD_resetCCtx_byAttachingCDict(ZSTD_CCtx* cctx,
         ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
                                 ZSTDcrp_continue, zbuff);
         assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy);
-        if (params.cParams.strategy > ZSTD_fast) {
+        if (params.cParams.strategy > ZSTD_dfast) {
             assert(cctx->appliedParams.cParams.hashLog == cdict_cParams->hashLog);
             assert(cctx->appliedParams.cParams.chainLog == cdict_cParams->chainLog);
         }