From: Yann Collet <yann.collet.73@gmail.com>
Date: Wed, 13 Jul 2016 13:16:00 +0000 (+0200)
Subject: changed macro name to ZSTDCLI_CLEVEL_DEFAULT
X-Git-Tag: v0.7.4^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b1a3638e66e770922406ea4c966179b317f5303;p=thirdparty%2Fzstd.git

changed macro name to ZSTDCLI_CLEVEL_DEFAULT
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 905eafd31..15a79d705 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -3017,16 +3017,16 @@ static const ZSTD_compressionParameters ZSTD_defaultCParameters[4][ZSTD_MAX_CLEV
 },
 {   /* for srcSize <= 16 KB */
     /* W,  C,  H,  S,  L,  T, strat */
-    { 14, 12, 12,  1,  7,  4, ZSTD_fast    },  /* level  0 - not used */
-    { 14, 14, 14,  1,  7,  4, ZSTD_fast    },  /* level  1 */
-    { 14, 14, 14,  1,  4,  4, ZSTD_fast    },  /* level  2 */
-    { 14, 14, 14,  1,  4,  4, ZSTD_dfast   },  /* level  3.*/
-    { 14, 14, 14,  4,  4,  4, ZSTD_greedy  },  /* level  4.*/
-    { 14, 14, 14,  3,  4,  4, ZSTD_lazy    },  /* level  5.*/
-    { 14, 14, 14,  4,  4,  4, ZSTD_lazy2   },  /* level  6 */
-    { 14, 14, 14,  5,  4,  4, ZSTD_lazy2   },  /* level  7 */
-    { 14, 14, 14,  6,  4,  4, ZSTD_lazy2   },  /* level  8.*/
-    { 14, 15, 14,  6,  4,  4, ZSTD_btlazy2 },  /* level  9.*/
+    { 14, 12, 12,  1,  7,  6, ZSTD_fast    },  /* level  0 - not used */
+    { 14, 14, 14,  1,  7,  6, ZSTD_fast    },  /* level  1 */
+    { 14, 14, 14,  1,  4,  6, ZSTD_fast    },  /* level  2 */
+    { 14, 14, 14,  1,  4,  6, ZSTD_dfast   },  /* level  3.*/
+    { 14, 14, 14,  4,  4,  6, ZSTD_greedy  },  /* level  4.*/
+    { 14, 14, 14,  3,  4,  6, ZSTD_lazy    },  /* level  5.*/
+    { 14, 14, 14,  4,  4,  6, ZSTD_lazy2   },  /* level  6 */
+    { 14, 14, 14,  5,  4,  6, ZSTD_lazy2   },  /* level  7 */
+    { 14, 14, 14,  6,  4,  6, ZSTD_lazy2   },  /* level  8.*/
+    { 14, 15, 14,  6,  4,  6, ZSTD_btlazy2 },  /* level  9.*/
     { 14, 15, 14,  3,  3,  6, ZSTD_btopt   },  /* level 10.*/
     { 14, 15, 14,  6,  3,  8, ZSTD_btopt   },  /* level 11.*/
     { 14, 15, 14,  6,  3, 16, ZSTD_btopt   },  /* level 12.*/
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 6669f5a27..edc87a00b 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -31,8 +31,8 @@
 /*-************************************
 *  Tuning parameters
 **************************************/
-#ifndef ZSTDCLI_DEFAULT_CLEVEL
-#  define ZSTDCLI_DEFAULT_CLEVEL 3
+#ifndef ZSTDCLI_CLEVEL_DEFAULT
+#  define ZSTDCLI_CLEVEL_DEFAULT 3
 #endif
 
 
@@ -215,7 +215,7 @@ int main(int argCount, const char** argv)
         nextArgumentIsMaxDict=0,
         nextArgumentIsDictID=0,
         nextArgumentIsFile=0;
-    unsigned cLevel = ZSTDCLI_DEFAULT_CLEVEL;
+    unsigned cLevel = ZSTDCLI_CLEVEL_DEFAULT;
     unsigned cLevelLast = 1;
     unsigned recursive = 0;
     const char** filenameTable = (const char**)malloc(argCount * sizeof(const char*));   /* argCount >= 1 */