From: Paul Cruz <paulcruz74@fb.com>
Date: Tue, 20 Jun 2017 19:43:10 +0000 (-0700)
Subject: moved signifcant operations to fileio.c
X-Git-Tag: v1.3.0~1^2~21^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda57754a2bed5845c583906f6def2486988e1fd;p=thirdparty%2Fzstd.git

moved signifcant operations to fileio.c
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 3964f0f97..059823952 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -1032,7 +1032,8 @@ static void displayInfo(const char* inFileName, fileInfo_t* info, int displayLev
     }
 }
 
-int FIO_listFile(const char* inFileName, int displayLevel){
+
+static int FIO_listFile(const char* inFileName, int displayLevel){
     /* initialize info to avoid warnings */
     fileInfo_t info;
     memset(&info, 0, sizeof(info));
@@ -1055,6 +1056,25 @@ int FIO_listFile(const char* inFileName, int displayLevel){
     }
 }
 
+int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int displayLevel){
+    if (numFiles == 0) {
+        DISPLAYOUT("No files given\n");
+        return 0;
+    }
+    DISPLAYOUT("===========================================\n");
+    DISPLAYOUT("Printing information about compressed files\n");
+    DISPLAYOUT("===========================================\n");
+    DISPLAYOUT("Number of files listed: %u\n", numFiles);
+    {
+        int error = 0;
+        unsigned u;
+        for (u=0; u<numFiles;u++) {
+            error |= FIO_listFile(filenameTable[u], displayLevel);
+        }
+        return error;
+    }
+}
+
 int FIO_compressMultipleFilenames(const char** inFileNamesTable, unsigned nbFiles,
                                   const char* suffix,
                                   const char* dictFileName, int compressionLevel,
diff --git a/programs/fileio.h b/programs/fileio.h
index b28ba1de7..9d9167df9 100644
--- a/programs/fileio.h
+++ b/programs/fileio.h
@@ -70,7 +70,7 @@ int FIO_compressFilename (const char* outfilename, const char* infilename, const
     @return : 0 == ok;  1 == pb with src file. */
 int FIO_decompressFilename (const char* outfilename, const char* infilename, const char* dictFileName);
 
-int FIO_listFile(const char* infilename, int displayLevel);
+int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int displayLevel);
 
 /*-*************************************
 *  Multiple File functions
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 2b0419b0c..846895f44 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -676,23 +676,8 @@ int main(int argCount, const char* argv[])
     }
 #endif
     if (operation == zom_list) {
-        g_displayOut = stdout;
-        if(filenameIdx==0){
-            DISPLAY("No files given\n");
-            CLEAN_RETURN(0);
-        }
-        DISPLAY("===========================================\n");
-        DISPLAY("Printing information about compressed files\n");
-        DISPLAY("===========================================\n");
-        DISPLAY("Number of files listed: %d\n", filenameIdx);
-        {
-            int error = 0;
-            unsigned u;
-            for (u=0; u<filenameIdx;u++) {
-                error |= FIO_listFile(filenameTable[u], g_displayLevel);
-            }
-            CLEAN_RETURN(error);
-        }
+        int const ret = FIO_listMultipleFiles(filenameIdx, filenameTable, g_displayLevel);
+        CLEAN_RETURN(ret);
     }
     /* Check if benchmark is selected */
     if (operation==zom_bench) {