From: Sen Huang <senhuang96@fb.com>
Date: Mon, 21 Oct 2019 02:01:08 +0000 (-0400)
Subject: Updated forceAttachDict param bounds
X-Git-Tag: v1.4.4~1^2~15^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8aa3e486d7ad23bafb19cc39be9db5bce4ee3c7;p=thirdparty%2Fzstd.git

Updated forceAttachDict param bounds
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 51e8f59c0..98d064397 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -387,7 +387,7 @@ ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter param)
     case ZSTD_c_forceAttachDict:
         ZSTD_STATIC_ASSERT(ZSTD_dictDefaultAttach < ZSTD_dictForceCopy);
         bounds.lowerBound = ZSTD_dictDefaultAttach;
-        bounds.upperBound = ZSTD_dictForceCopy;       /* note : how to ensure at compile time that this is the highest value enum ? */
+        bounds.upperBound = ZSTD_dictForceSource;       /* note : how to ensure at compile time that this is the highest value enum ? */
         return bounds;
 
     case ZSTD_c_literalCompressionMode:
@@ -3349,7 +3349,7 @@ size_t 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->attachDictPref != ZSTD_dictForceSource) ?
+                      && (params.attachDictPref != ZSTD_dictForceSource) ?
                 ZSTD_getCParamsFromCDict(cdict)
               : ZSTD_getCParams(cdict->compressionLevel,
                                 pledgedSrcSize,
diff --git a/lib/zstd.h b/lib/zstd.h
index c0521c1b8..5468c34cc 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_dictForceSource = 3, /* Always use src input to determine tables */
+    ZSTD_dictForceSource   = 3, /* Always use src input to determine tables */
 } ZSTD_dictAttachPref_e;
 
 typedef enum {