changed macro name to ZSTDCLI_CLEVEL_DEFAULT

This commit is contained in:
Yann Collet
2016-07-13 15:16:00 +02:00
parent 3c242e79d3
commit 2b1a3638e6
2 changed files with 13 additions and 13 deletions
+10 -10
View File
@@ -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.*/
+3 -3
View File
@@ -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 */