From: Sen Huang <senhuang96@fb.com>
Date: Sun, 20 Oct 2019 23:02:47 +0000 (-0400)
Subject: Add enum to decision process
X-Git-Tag: v1.4.4~1^2~15^2~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f69c476439b6492161ea798832a708a3b877164;p=thirdparty%2Fzstd.git

Add enum to decision process
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index ab5b13d01..84af6feea 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2909,7 +2909,7 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
     if ( (cdict)
       && (cdict->dictContentSize > 0)
       && (pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_CUTOFF || cdict->compressionLevel == 0)
-      && (params->attachDictPref != ZSTD_dictForceInputParams) ) {
+      && (params->attachDictPref != ZSTD_dictForceSource) ) {
         return ZSTD_resetCCtx_usingCDict(cctx, cdict, params, pledgedSrcSize, zbuff);
     }
 
@@ -3357,7 +3357,8 @@ size_t ZSTD_compressBegin_usingCDict_advanced(
     DEBUGLOG(4, "ZSTD_compressBegin_usingCDict_advanced");
     RETURN_ERROR_IF(cdict==NULL, dictionary_wrong);
     {   ZSTD_CCtx_params params = cctx->requestedParams;
-        params.cParams = (pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_CUTOFF) || (cdict->compressionLevel == 0) ?
+        params.cParams = ( (pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_CUTOFF) || (cdict->compressionLevel == 0) )
+                      && (params->attachDictPref != ZSTD_dictForceSource) ?
                 ZSTD_getCParamsFromCDict(cdict)
               : ZSTD_getCParams(cdict->compressionLevel,
                                 pledgedSrcSize,
diff --git a/lib/zstd.h b/lib/zstd.h
index 4859733bb..c0521c1b8 100644
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@ -1177,7 +1177,7 @@ typedef enum {
     ZSTD_dictDefaultAttach = 0, /* Use the default heuristic. */
     ZSTD_dictForceAttach   = 1, /* Never copy the dictionary. */
     ZSTD_dictForceCopy     = 2, /* Always copy the dictionary. */
-    ZSTD_dictForceInputParams = 3, /* Always use input to determine tables */
+    ZSTD_dictForceSource = 3, /* Always use src input to determine tables */
 } ZSTD_dictAttachPref_e;
 
 typedef enum {