From: Paul Cruz <paulcruz74@fb.com>
Date: Fri, 16 Jun 2017 00:30:18 +0000 (-0700)
Subject: initialized info manually to avoid error
X-Git-Tag: v1.3.0~1^2~21^2~16^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d7c4d766ab9358b58e193b579578b6442e2f8fd;p=thirdparty%2Fzstd.git

initialized info manually to avoid error
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 8db61a6fc..5ab3c5be0 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -884,10 +884,6 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
         return 1;
     }
     info->compressedSize = (unsigned long long)UTIL_getFileSize(inFileName);
-    info->decompressedSize = 0;
-    info->numActualFrames = 0;
-    info->numSkippableFrames = 0;
-    info->canComputeDecompSize = 1;
     /* begin analyzing frame */
     for( ; ; ){
         BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX];
@@ -1014,10 +1010,11 @@ static void displayInfo(const char* inFileName, fileInfo_t* info, int displayLev
     const char* checkString = (info->usesCheck ? "XXH64" : "None");
     if (displayLevel <= 2) {
         if (info->canComputeDecompSize) {
+            double const ratio = (info->decompressedSize == 0) ? 0.0 : compressedSizeMB/decompressedSizeMB;
             DISPLAYOUT("Skippable  Non-Skippable  Compressed  Uncompressed  Ratio  Check  Filename\n");
             DISPLAYOUT("%9d  %13d  %7.2f MB  %9.2f MB  %5.3f  %s  %s\n",
                     info->numSkippableFrames, info->numActualFrames, compressedSizeMB, decompressedSizeMB,
-                    compressedSizeMB/decompressedSizeMB, checkString, inFileName);
+                    ratio, checkString, inFileName);
         }
         else {
             DISPLAYOUT("Skippable  Non-Skippable  Compressed  Check  Filename\n");
@@ -1043,6 +1040,14 @@ static void displayInfo(const char* inFileName, fileInfo_t* info, int displayLev
 
 int FIO_listFile(const char* inFileName, int displayLevel){
     fileInfo_t info;
+
+    /* initialize info to avoid warnings */
+    info.numActualFrames = 0;
+    info.numSkippableFrames = 0;
+    info.decompressedSize = 0;
+    info.canComputeDecompSize = 1;
+    info.compressedSize = 0;
+    info.usesCheck = 0;
     DISPLAYOUT("File: %s\n", inFileName);
     {
         int const error = getFileInfo(&info, inFileName);