]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
util.h must be the first include to #define _POSIX_C_SOURCE
authorinikep <inikep@gmail.com>
Fri, 29 Apr 2016 13:18:50 +0000 (15:18 +0200)
committerinikep <inikep@gmail.com>
Fri, 29 Apr 2016 13:18:50 +0000 (15:18 +0200)
programs/bench.c
programs/dibio.c
programs/fileio.c
programs/fullbench.c
programs/paramgrill.c

index dd9f289b653ffc710b39caccca8ea6e3f72519fe..85c28e8c2a8b6ebad51cd5cc19498454ac56279b 100644 (file)
@@ -436,6 +436,7 @@ static void BMK_loadFiles(void* buffer, size_t bufferSize,
         U64 fileSize = UTIL_getFileSize(fileNamesTable[n]);
         if (UTIL_isDirectory(fileNamesTable[n])) {
             DISPLAYLEVEL(2, "Ignoring %s directory...       \n", fileNamesTable[n]);
+            fileSizes[n] = 0;
             continue;
         }
         f = fopen(fileNamesTable[n], "rb");
index ccdf5057e86694356de9476b6d5024f66e2dd5f1..fe947bd8af2369744ad3b0b44de5863f05352d6c 100644 (file)
 /*-*************************************
 *  Includes
 ***************************************/
+#include "util.h"           /* UTIL_GetFileSize */
 #include <stdlib.h>         /* malloc, free */
 #include <string.h>         /* memset */
 #include <stdio.h>          /* fprintf, fopen, ftello64 */
 
-#include "util.h"           /* UTIL_GetFileSize */
 #include "mem.h"            /* read */
 #include "error_private.h"
 #include "dibio.h"
index 964fc31fff45f26965da1f2784a973af5b3e1030..5a1b37d32f28c741b4ca0b8657e786d057b62c71 100644 (file)
@@ -61,7 +61,7 @@
 #include <time.h>       /* clock */
 #include <errno.h>      /* errno */
 
-#include "util.h"        /* UTIL_GetFileSize */
+#include "util.h"       /* UTIL_GetFileSize */
 #include "mem.h"
 #include "fileio.h"
 #include "zstd_static.h"   /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */
index 3188c0f246190774ede25807e1b12620ac09900b..f77276545b65508549f0f5748a699b32255a6f21 100644 (file)
@@ -46,7 +46,7 @@
 #include <string.h>       /* strcmp */
 #include <time.h>         /* clock_t, clock, CLOCKS_PER_SEC */
 
-#include "util.h"        /* UTIL_GetFileSize */
+#include "util.h"         /* UTIL_GetFileSize */
 #include "mem.h"
 #include "zstd_static.h"
 #include "fse_static.h"
index a904726a13ad6a237e668fa7f5f6ed98885aafa6..f36a6916f512e7dcc466d54cdf49677607bac345 100644 (file)
@@ -50,6 +50,7 @@
 /*-************************************
 *  Dependencies
 **************************************/
+#include "util.h"         /* UTIL_GetFileSize */
 #include <stdlib.h>       /* malloc */
 #include <stdio.h>        /* fprintf, fopen, ftello64 */
 #include <string.h>       /* strcmp */
@@ -62,7 +63,6 @@
 #  include <sys/time.h>   /* gettimeofday */
 #endif
 
-#include "util.h"        /* UTIL_GetFileSize */
 #include "mem.h"
 #include "zstd_static.h"
 #include "datagen.h"