]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Adding back one cast and using UTIL_FILESIZE_UNKNOWN to check unknown file size
authorBimba Shrestha <bimbashrestha@fb.com>
Fri, 31 Jan 2020 01:16:02 +0000 (17:16 -0800)
committerBimba Shrestha <bimbashrestha@fb.com>
Fri, 31 Jan 2020 01:16:02 +0000 (17:16 -0800)
programs/zstdcli.c

index aa6df7b66c19ce3ed7d09fd3a0824106a8ec485f..40d1e621c28859b68d1e3edc4bcc6f3662ff6200 100644 (file)
@@ -1230,10 +1230,10 @@ int main(int const argCount, const char* argv[])
         if (showDefaultCParams) {
             size_t fileNb;
             for (fileNb = 0; fileNb < (size_t)filenames->tableSize; fileNb++) {
-                unsigned long long fileSize = UTIL_isRegularFile(filenames->fileNames[fileNb]) ? UTIL_getFileSize(filenames->fileNames[fileNb]) : 0;
+                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) DISPLAY("%s (%u bytes)\n", filenames->fileNames[fileNb], fileSize);
+                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);