fixing c90 issue in util.c cont.
This commit is contained in:
parent
aefa18ee38
commit
8a9741b3ee
@ -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*/
|
/* 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) {
|
static int readFromFile(char* buf, size_t inputFileSize, const char* inputFileName) {
|
||||||
|
|
||||||
UTIL_DISPLAY("[TRACE] open file\n");
|
|
||||||
FILE* inputFile = fopen(inputFileName, "r");
|
FILE* inputFile = fopen(inputFileName, "r");
|
||||||
int nbFiles = -1;
|
int nbFiles = -1;
|
||||||
unsigned pos = 0;
|
unsigned pos = 0;
|
||||||
|
|
||||||
|
UTIL_DISPLAY("[TRACE] open file\n");
|
||||||
|
|
||||||
if(!buf) {
|
if(!buf) {
|
||||||
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create buffer.\n");
|
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create buffer.\n");
|
||||||
return -1;
|
return -1;
|
||||||
@ -239,6 +240,7 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
|
|||||||
U64 inputFileSize = 0;
|
U64 inputFileSize = 0;
|
||||||
unsigned nbFiles = 0;
|
unsigned nbFiles = 0;
|
||||||
int ret_nbFiles = -1;
|
int ret_nbFiles = -1;
|
||||||
|
char* buf = NULL;
|
||||||
|
|
||||||
FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));;
|
FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));;
|
||||||
|
|
||||||
@ -254,7 +256,7 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
|
|||||||
if(inputFileSize > MAX_FILE_OF_FILE_NAMES_SIZE)
|
if(inputFileSize > MAX_FILE_OF_FILE_NAMES_SIZE)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
char* buf = (char*) malloc(inputFileSize * sizeof(char));
|
buf = (char*) malloc(inputFileSize * sizeof(char));
|
||||||
if(!buf) {
|
if(!buf) {
|
||||||
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create buffer.\n");
|
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create buffer.\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user