code cleaning

This commit is contained in:
inikep 2016-05-05 13:58:56 +02:00
parent 0bd0faec32
commit 13c8424ea0
6 changed files with 12 additions and 23 deletions

View File

@ -330,10 +330,10 @@ UTIL_STATIC int UTIL_createFileList(const char **inputNames, unsigned nbNames, u
char *pbuf, *bufend, *buf;
buf = (char*)malloc(maxListSize);
if (!buf) { *filenameTable = NULL; return 0; }
if (!buf) { *filenameTable = NULL; return 0; }
bufend = buf + maxListSize;
for (i=0, pbuf = buf; i<nbNames; i++) {
for (i=0, pbuf = buf; i<nbNames; i++) {
if (UTIL_doesFileExists(inputNames[i])) {
// printf ("UTIL_doesFileExists=[%s]\n", inputNames[i]);
size_t len = strlen(inputNames[i]);
@ -347,7 +347,7 @@ UTIL_STATIC int UTIL_createFileList(const char **inputNames, unsigned nbNames, u
}
{ const char** fileTable = (const char**)malloc((nbFiles+1) * sizeof(const char*));
if (!fileTable) { free(buf); *filenameTable = NULL; return 0; }
if (!fileTable) { free(buf); *filenameTable = NULL; return 0; }
if (nbFiles == 0)
fileTable[0] = buf;

View File

@ -26,7 +26,7 @@
/* *************************************
* Includes
***************************************/
#include "util.h" /* UTIL_GetFileSize */
#include "util.h" /* Compiler options, UTIL_GetFileSize, UTIL_createFileList, UTIL_sleep */
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
#include <stdio.h> /* fprintf, fopen, ftello64 */
@ -37,17 +37,6 @@
#include "xxhash.h"
/* *************************************
* Compiler specifics
***************************************/
#if defined(_MSC_VER)
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))
/* part of <stdio.h> */
#else
extern int snprintf (char* s, size_t maxlen, const char* format, ...); /* not declared in <stdio.h> when C version < c99 */
#endif
/* *************************************
* Constants

View File

@ -25,7 +25,7 @@
/*-*************************************
* Includes
***************************************/
#include "util.h" /* UTIL_GetFileSize */
#include "util.h" /* Compiler options, UTIL_GetFileSize, UTIL_getTotalFileSize */
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
#include <stdio.h> /* fprintf, fopen, ftello64 */

View File

@ -47,7 +47,7 @@
/*-*************************************
* Includes
***************************************/
#include "util.h" /* UTIL_GetFileSize */
#include "util.h" /* Compiler options, UTIL_GetFileSize */
#include <stdio.h> /* fprintf, fopen, fread, _fileno, stdin, stdout */
#include <stdlib.h> /* malloc, free */
#include <string.h> /* strcmp, strlen */

View File

@ -25,11 +25,11 @@
/*_************************************
* Includes
**************************************/
#include "util.h" /* UTIL_GetFileSize */
#include <stdlib.h> /* malloc */
#include <stdio.h> /* fprintf, fopen, ftello64 */
#include <string.h> /* strcmp */
#include <time.h> /* clock_t, clock, CLOCKS_PER_SEC */
#include "util.h" /* Compiler options, UTIL_GetFileSize */
#include <stdlib.h> /* malloc */
#include <stdio.h> /* fprintf, fopen, ftello64 */
#include <string.h> /* strcmp */
#include <time.h> /* clock_t, clock, CLOCKS_PER_SEC */
#include "mem.h"
#include "zstd_static.h"

View File

@ -34,7 +34,7 @@
/*-************************************
* Dependencies
**************************************/
#include "util.h" /* UTIL_GetFileSize */
#include "util.h" /* Compiler options, UTIL_GetFileSize */
#include <stdlib.h> /* malloc */
#include <stdio.h> /* fprintf, fopen, ftello64 */
#include <string.h> /* strcmp */