]> 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:30:05 +0000 (10:30 +0100)
committerAhmed Abdellah <ahmedabdellah@fb.com>
Thu, 24 Oct 2019 09:30:05 +0000 (10:30 +0100)
programs/util.c

index c79fe7d44bf57813651ba6e54900bfc48aaf3fd2..f3e76bf8677be5ad11801abb7af1a8e4737e7c9c 100644 (file)
@@ -241,11 +241,10 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
     unsigned nbFiles = 0;
     int ret_nbFiles = -1;
     char* buf = NULL;
-
-    FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));;
-
     size_t i = 0, pos = 0;
 
+    FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));
+
     UTIL_DISPLAY("file check\n");
     if(!UTIL_fileExist(inputFileName) || !UTIL_isRegularFile(inputFileName))
       return NULL;
@@ -329,11 +328,12 @@ FileNamesTable*
 UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) {
     unsigned newTableIdx = 0, idx1 = 0, idx2 = 0;
     size_t i = 0, pos = 0;
-
     size_t newTotalTableSize = 0;
 
     FileNamesTable* newTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));
 
+    char* buf = NULL;
+
     UTIL_DISPLAY("[TRACE] Start concatenation\n");
 
     UTIL_DISPLAY("[TRACE] newTable created\n");
@@ -346,7 +346,7 @@ UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) {
     newTotalTableSize = getTotalTableSize(table1) + getTotalTableSize(table2);
     UTIL_DISPLAY("[TRACE] buf total size is: %zu\n", newTotalTableSize);
 
-    char* buf = (char*) malloc(newTotalTableSize * sizeof(char));
+    buf = (char*) malloc(newTotalTableSize * sizeof(char));
     if(!buf) {
       UTIL_freeFileNamesTable(newTable);
       UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_concatenateTwoTables] Can't create buf for concatenation output.\n");