]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
fixing c90 issue in util.c cont.
authorAhmed Abdellah <ahmedabdellah@fb.com>
Thu, 24 Oct 2019 09:17:31 +0000 (10:17 +0100)
committerAhmed Abdellah <ahmedabdellah@fb.com>
Thu, 24 Oct 2019 09:17:31 +0000 (10:17 +0100)
programs/util.c

index a79278500b0768d0d4e0624d3ae9677d2074b88c..10c4fe4b6f4857c3467f5c11d3c860af7e7874af 100644 (file)
@@ -199,11 +199,12 @@ int UTIL_readLineFromFile(char* buf, size_t len, FILE* file) {
 /* Warning: inputFileSize should be less than or equal buf capacity and buf should be initialized*/
 static int readFromFile(char* buf, size_t inputFileSize, const char* inputFileName) {
 
-  UTIL_DISPLAY("[TRACE] open file\n");
   FILE* inputFile = fopen(inputFileName, "r");
   int nbFiles = -1;
   unsigned pos = 0;
 
+  UTIL_DISPLAY("[TRACE] open file\n");
+
   if(!buf) {
     UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create buffer.\n");
     return -1;
@@ -239,6 +240,7 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
     U64 inputFileSize = 0;
     unsigned nbFiles = 0;
     int ret_nbFiles = -1;
+    char* buf = NULL;
 
     FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));;
 
@@ -254,7 +256,7 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
     if(inputFileSize > MAX_FILE_OF_FILE_NAMES_SIZE)
       return NULL;
 
-    char* buf = (char*) malloc(inputFileSize * sizeof(char));
+    buf = (char*) malloc(inputFileSize * sizeof(char));
     if(!buf) {
       UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create buffer.\n");
       return NULL;