From: Yann Collet <cyan@fb.com>
Date: Mon, 24 Sep 2018 23:56:45 +0000 (-0700)
Subject: Merge branch 'dev' into adapt
X-Git-Tag: v1.3.6^2~19^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f47bbdd263eaf8045799b7294f86e2153460b3;p=thirdparty%2Fzstd.git

Merge branch 'dev' into adapt
---

04f47bbdd263eaf8045799b7294f86e2153460b3
diff --cc programs/zstdcli.c
index 253bb0d06,506832052..9ace49c4e
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@@ -1005,17 -1007,21 +1011,17 @@@ int main(int argCount, const char* argv
          FIO_setLdmFlag(ldmFlag);
          FIO_setLdmHashLog(g_ldmHashLog);
          FIO_setLdmMinMatch(g_ldmMinMatch);
 -        if (g_ldmBucketSizeLog != LDM_PARAM_DEFAULT) {
 -            FIO_setLdmBucketSizeLog(g_ldmBucketSizeLog);
 -        }
 -        if (g_ldmHashEveryLog != LDM_PARAM_DEFAULT) {
 -            FIO_setLdmHashEveryLog(g_ldmHashEveryLog);
 -        }
 +        if (g_ldmBucketSizeLog != LDM_PARAM_DEFAULT) FIO_setLdmBucketSizeLog(g_ldmBucketSizeLog);
 +        if (g_ldmHashEveryLog != LDM_PARAM_DEFAULT) FIO_setLdmHashEveryLog(g_ldmHashEveryLog);
 +        FIO_setAdaptiveMode(adapt);
  
 -        if (g_overlapLog!=OVERLAP_LOG_DEFAULT) FIO_setOverlapLog(g_overlapLog);
          if ((filenameIdx==1) && outFileName)
 -          operationResult = FIO_compressFilename(outFileName, filenameTable[0], dictFileName, cLevel, &compressionParams);
 +          operationResult = FIO_compressFilename(outFileName, filenameTable[0], dictFileName, cLevel, compressionParams);
          else
 -          operationResult = FIO_compressMultipleFilenames(filenameTable, filenameIdx, outFileName, suffix, dictFileName, cLevel, &compressionParams);
 +          operationResult = FIO_compressMultipleFilenames(filenameTable, filenameIdx, outFileName, suffix, dictFileName, cLevel, compressionParams);
  #else
-         (void)suffix; (void)adapt;
 -        (void)suffix; (void)ultra; (void)cLevel; (void)ldmFlag; /* not used when ZSTD_NOCOMPRESS set */
--        DISPLAY("Compression not supported\n");
++        (void)suffix; (void)adapt; (void)ultra; (void)cLevel; (void)ldmFlag; /* not used when ZSTD_NOCOMPRESS set */
++        DISPLAY("Compression not supported \n");
  #endif
      } else {  /* decompression or test */
  #ifndef ZSTD_NODECOMPRESS
@@@ -1032,7 -1038,7 +1038,7 @@@
          else
              operationResult = FIO_decompressMultipleFilenames(filenameTable, filenameIdx, outFileName, dictFileName);
  #else
--        DISPLAY("Decompression not supported\n");
++        DISPLAY("Decompression not supported \n");
  #endif
      }