Display --zstd= subparameters in command-line ready form in verbose mode

facebook · Nov 5, 2021 · 9bd38cc · 9bd38cc
1 parent 0665d4c
commit 9bd38cc
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
@@ -1411,22 +1411,28 @@ int main(int argCount, const char* argv[])
           assert(ZSTD_NB_STRATEGIES == strategyBounds.upperBound);
           (void)strategyBounds; }
 
-        if (showDefaultCParams) {
+        if (showDefaultCParams || g_displayLevel >= 4) {
             size_t fileNb;
             for (fileNb = 0; fileNb < (size_t)filenames->tableSize; fileNb++) {
                 unsigned long long fileSize = UTIL_getFileSize(filenames->fileNames[fileNb]);
                 const size_t dictSize = dictFileName != NULL ? (size_t)UTIL_getFileSize(dictFileName) : 0;
                 const ZSTD_compressionParameters cParams = ZSTD_getCParams(cLevel, fileSize, dictSize);
-                if (fileSize != UTIL_FILESIZE_UNKNOWN) DISPLAY("%s (%u bytes)\n", filenames->fileNames[fileNb], (unsigned)fileSize);
-                else DISPLAY("%s (src size unknown)\n", filenames->fileNames[fileNb]);
-                DISPLAY(" - windowLog     : %u\n", cParams.windowLog);
-                DISPLAY(" - chainLog      : %u\n", cParams.chainLog);
-                DISPLAY(" - hashLog       : %u\n", cParams.hashLog);
-                DISPLAY(" - searchLog     : %u\n", cParams.searchLog);
-                DISPLAY(" - minMatch      : %u\n", cParams.minMatch);
-                DISPLAY(" - targetLength  : %u\n", cParams.targetLength);
-                assert(cParams.strategy < ZSTD_NB_STRATEGIES + 1);
-                DISPLAY(" - strategy      : %s (%u)\n", ZSTD_strategyMap[(int)cParams.strategy], (unsigned)cParams.strategy);
+                if (showDefaultCParams) {
+                    if (fileSize != UTIL_FILESIZE_UNKNOWN) DISPLAY("%s (%u bytes)\n", filenames->fileNames[fileNb], (unsigned)fileSize);
+                    else DISPLAY("%s (src size unknown)\n", filenames->fileNames[fileNb]);
+                    DISPLAY(" - windowLog     : %u\n", cParams.windowLog);
+                    DISPLAY(" - chainLog      : %u\n", cParams.chainLog);
+                    DISPLAY(" - hashLog       : %u\n", cParams.hashLog);
+                    DISPLAY(" - searchLog     : %u\n", cParams.searchLog);
+                    DISPLAY(" - minMatch      : %u\n", cParams.minMatch);
+                    DISPLAY(" - targetLength  : %u\n", cParams.targetLength);
+                    assert(cParams.strategy < ZSTD_NB_STRATEGIES + 1);
+                    DISPLAY(" - strategy      : %s (%u)\n", ZSTD_strategyMap[(int)cParams.strategy], (unsigned)cParams.strategy);
+                }
+
+                DISPLAYLEVEL(4, "--zstd=wlog=%d,clog=%d,hlog=%d,slog=%d,mml=%d,tlen=%d,strat=%d\n",
+                             cParams.windowLog, cParams.chainLog, cParams.hashLog, cParams.searchLog,
+                             cParams.minMatch, cParams.targetLength, cParams.strategy);
             }
         }