lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

fixing c90 issue in util.c

Browse Source
This commit is contained in:
Ahmed Abdellah
2019-10-24 10:12:51 +01:00
parent f43e45954f
commit aefa18ee38
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
programs/util.c
View File

@ -176,13 +176,15 @@ U64 UTIL_getTotalFileSize(const char* const * const fileNamesTable, unsigned nbF
int UTIL_readLineFromFile(char* buf, size_t len, FILE* file) { int UTIL_readLineFromFile(char* buf, size_t len, FILE* file) {
char* fgetsCheck = NULL;
if (feof(file)) { if (feof(file)) {
UTIL_DISPLAYLEVEL(1, "[ERROR] end of file reached and need to read\n"); UTIL_DISPLAYLEVEL(1, "[ERROR] end of file reached and need to read\n");
return -1; return -1;
} }
UTIL_DISPLAY("[TRACE] read line\n"); UTIL_DISPLAY("[TRACE] read line\n");
char* fgetsCheck = fgets(buf, len, file); fgetsCheck = fgets(buf, len, file);
if(fgetsCheck == NULL || fgetsCheck != buf) { if(fgetsCheck == NULL || fgetsCheck != buf) {
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readLineFromFile] fgets has a problem check: %s buf: %s \n", UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readLineFromFile] fgets has a problem check: %s buf: %s \n",
@ -197,21 +199,21 @@ 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");
int nbFiles = -1;
unsigned pos = 0;
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;
} }
UTIL_DISPLAY("[TRACE] open file\n");
FILE* inputFile = fopen(inputFileName, "r");
int nbFiles = -1;
if(!inputFile) { if(!inputFile) {
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't open file to read input file names.\n"); UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't open file to read input file names.\n");
return -1; return -1;
} }
unsigned pos = 0;
for(nbFiles=0; !feof(inputFile) ; ) { for(nbFiles=0; !feof(inputFile) ; ) {
if(UTIL_readLineFromFile(buf+pos, inputFileSize, inputFile) > 0) { if(UTIL_readLineFromFile(buf+pos, inputFileSize, inputFile) > 0) {
int len = (int) strlen(buf+pos); int len = (int) strlen(buf+pos);
@ -234,13 +236,20 @@ static int readFromFile(char* buf, size_t inputFileSize, const char* inputFileNa
/*Note: buf is not freed in case function successfully created table because filesTable->fileNames[0] = buf*/ /*Note: buf is not freed in case function successfully created table because filesTable->fileNames[0] = buf*/
FileNamesTable* FileNamesTable*
UTIL_createFileNamesTable_fromFileName(const char* inputFileName) { UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
U64 inputFileSize = 0;
unsigned nbFiles = 0;
int ret_nbFiles = -1;
FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));;
size_t i = 0, pos = 0;
UTIL_DISPLAY("file check\n"); UTIL_DISPLAY("file check\n");
if(!UTIL_fileExist(inputFileName) || !UTIL_isRegularFile(inputFileName)) if(!UTIL_fileExist(inputFileName) || !UTIL_isRegularFile(inputFileName))
return NULL; return NULL;
UTIL_DISPLAY("[TRACE] start function readFileNamesTableFromFile\n"); UTIL_DISPLAY("[TRACE] start function readFileNamesTableFromFile\n");
U64 inputFileSize = UTIL_getFileSize(inputFileName) + 1; /* (+1) to add '\0' at the end of last filename */ inputFileSize = UTIL_getFileSize(inputFileName) + 1; /* (+1) to add '\0' at the end of last filename */
if(inputFileSize > MAX_FILE_OF_FILE_NAMES_SIZE) if(inputFileSize > MAX_FILE_OF_FILE_NAMES_SIZE)
return NULL; return NULL;
@ -251,17 +260,16 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
return NULL; return NULL;
} }
int ret_nbFiles = readFromFile(buf, inputFileSize, inputFileName); ret_nbFiles = readFromFile(buf, inputFileSize, inputFileName);
if(ret_nbFiles <= 0) { if(ret_nbFiles <= 0) {
free(buf); free(buf);
return NULL; return NULL;
} }
unsigned nbFiles = ret_nbFiles; nbFiles = ret_nbFiles;
UTIL_DISPLAY("[TRACE] file closed with %d read lines\n", nbFiles); UTIL_DISPLAY("[TRACE] file closed with %d read lines\n", nbFiles);
FileNamesTable* filesTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));
if(!filesTable) { if(!filesTable) {
free(buf); free(buf);
UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create table for files.\n"); UTIL_DISPLAYLEVEL(1, "[ERROR][UTIL_readFileNamesTableFromFile] Can't create table for files.\n");
@ -273,7 +281,7 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
UTIL_DISPLAY("[TRACE] Start migration\n"); UTIL_DISPLAY("[TRACE] Start migration\n");
size_t i = 0, pos = 0;
for(i = 0, pos = 0; i < nbFiles; ++i) { for(i = 0, pos = 0; i < nbFiles; ++i) {
filesTable->fileNames[i] = buf+pos; filesTable->fileNames[i] = buf+pos;
UTIL_DISPLAY("[TRACE] file %zu: %s\n", i, filesTable->fileNames[i]); UTIL_DISPLAY("[TRACE] file %zu: %s\n", i, filesTable->fileNames[i]);
@ -283,7 +291,7 @@ UTIL_createFileNamesTable_fromFileName(const char* inputFileName) {
UTIL_DISPLAY("[TRACE] migration done\n"); UTIL_DISPLAY("[TRACE] migration done\n");
UTIL_DISPLAY("[TRACE] pos %zu inputFileSize %llu\n", pos, inputFileSize); UTIL_DISPLAY("[TRACE] pos %zu inputFileSize %lu\n", pos, inputFileSize);
if(pos > inputFileSize){ if(pos > inputFileSize){
UTIL_freeFileNamesTable(filesTable); UTIL_freeFileNamesTable(filesTable);
if(buf) free(buf); if(buf) free(buf);
@ -308,7 +316,6 @@ void UTIL_freeFileNamesTable(FileNamesTable* table) {
} }
static size_t getTotalTableSize(FileNamesTable* table) { static size_t getTotalTableSize(FileNamesTable* table) {
UTIL_DISPLAY("[TRACE] getTotalTableSize \n");
size_t i = 0, totalSize = 0; size_t i = 0, totalSize = 0;
for(i = 0 ; i < table->tableSize && table->fileNames[i] ; ++i) { for(i = 0 ; i < table->tableSize && table->fileNames[i] ; ++i) {
totalSize += strlen(table->fileNames[i]) + 1; /* +1 to add '\0' at the end of each fileName */ totalSize += strlen(table->fileNames[i]) + 1; /* +1 to add '\0' at the end of each fileName */
@ -319,12 +326,15 @@ static size_t getTotalTableSize(FileNamesTable* table) {
FileNamesTable* FileNamesTable*
UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) { UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) {
UTIL_DISPLAY("[TRACE] Start concatenation\n");
unsigned newTableIdx = 0, idx1 = 0, idx2 = 0; unsigned newTableIdx = 0, idx1 = 0, idx2 = 0;
size_t i = 0; size_t i = 0, pos = 0;
size_t newTotalTableSize = 0;
FileNamesTable* newTable = (FileNamesTable*) malloc(sizeof(FileNamesTable)); FileNamesTable* newTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));
UTIL_DISPLAY("[TRACE] Start concatenation\n");
UTIL_DISPLAY("[TRACE] newTable created\n"); UTIL_DISPLAY("[TRACE] newTable created\n");
if(!newTable) { if(!newTable) {
@ -332,7 +342,7 @@ UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) {
return NULL; return NULL;
} }
size_t newTotalTableSize = getTotalTableSize(table1) + getTotalTableSize(table2); newTotalTableSize = getTotalTableSize(table1) + getTotalTableSize(table2);
UTIL_DISPLAY("[TRACE] buf total size is: %zu\n", newTotalTableSize); UTIL_DISPLAY("[TRACE] buf total size is: %zu\n", newTotalTableSize);
char* buf = (char*) malloc(newTotalTableSize * sizeof(char)); char* buf = (char*) malloc(newTotalTableSize * sizeof(char));
@ -358,7 +368,6 @@ UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) {
newTable->fileNames[i] = NULL; newTable->fileNames[i] = NULL;
UTIL_DISPLAY("[TRACE] add table1 concatenation of size %zu\n", table1->tableSize); UTIL_DISPLAY("[TRACE] add table1 concatenation of size %zu\n", table1->tableSize);
size_t pos = 0;
for( ; idx1 < table1->tableSize && table1->fileNames[idx1] && pos < newTotalTableSize; ++idx1, ++newTableIdx) { for( ; idx1 < table1->tableSize && table1->fileNames[idx1] && pos < newTotalTableSize; ++idx1, ++newTableIdx) {
size_t curLen = strlen(table1->fileNames[idx1]); size_t curLen = strlen(table1->fileNames[idx1]);
memcpy(buf+pos, table1->fileNames[idx1], curLen); memcpy(buf+pos, table1->fileNames[idx1], curLen);
@ -399,11 +408,12 @@ UTIL_concatenateTwoTables(FileNamesTable* table1, FileNamesTable* table2) {
for(newTableIdx = 0; newTableIdx < newTable->tableSize && newTable->fileNames[newTableIdx] ; ++newTableIdx) for(newTableIdx = 0; newTableIdx < newTable->tableSize && newTable->fileNames[newTableIdx] ; ++newTableIdx)
UTIL_DISPLAY("[TRACE] %u %s\n", newTableIdx, newTable->fileNames[newTableIdx]); UTIL_DISPLAY("[TRACE] %u %s\n", newTableIdx, newTable->fileNames[newTableIdx]);
newTable->buf = buf;
UTIL_freeFileNamesTable(table1); UTIL_freeFileNamesTable(table1);
UTIL_freeFileNamesTable(table2); UTIL_freeFileNamesTable(table2);
UTIL_DISPLAY("[TRACE] concatenation finished\n"); UTIL_DISPLAY("[TRACE] concatenation finished\n");
newTable->buf = buf;
return newTable; return newTable;
} }

6
programs/zstdcli.c
View File

@ -820,14 +820,10 @@ int main(int argCount, const char* argv[])
DISPLAYLEVEL(4, "[TRACE] call read function is finished\n"); DISPLAYLEVEL(4, "[TRACE] call read function is finished\n");
DISPLAYLEVEL(4, "[TRACE] extendedFileNamesTable:\n"); DISPLAYLEVEL(4, "[TRACE] extendedFileNamesTable:\n");
DISPLAYLEVEL(4, "[TRACE] call concatenation function\n"); DISPLAYLEVEL(4, "[TRACE] call concatenation function\n");
DISPLAYLEVEL(4, "[TRACE] filenameidx: %d\n", filenameIdx); DISPLAYLEVEL(4, "[TRACE] filenameidx: %d\n", filenameIdx);
// unsigned i = 0; filenameTable[filenameIdx] = NULL; // marking end of table
// for(i = filenameIdx; i < filenameTableSize ; ++i)
filenameTable[filenameIdx] = NULL; // marking end of table
curTable = (FileNamesTable*) malloc(sizeof(FileNamesTable)); curTable = (FileNamesTable*) malloc(sizeof(FileNamesTable));