sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-11-22 00:10:22 -05:00
Code Issues Projects Releases Wiki Activity

silenced false-positive scan-build warning

Browse Source
This commit is contained in:
Yann Collet 2018-08-31 10:01:06 -07:00
parent 0ff67511e6
commit 11b8b8c100
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contrib/largeNbDicts/largeNbDicts.c
View File

@ -74,6 +74,7 @@ static const buffer_t kBuffNull = { NULL, 0, 0 };
/* @return : kBuffNull if any error */ /* @return : kBuffNull if any error */
static buffer_t createBuffer(size_t capacity) static buffer_t createBuffer(size_t capacity)
{ {
assert(capacity > 0);
void* const ptr = malloc(capacity); void* const ptr = malloc(capacity);
if (ptr==NULL) return kBuffNull; if (ptr==NULL) return kBuffNull;
@ -96,18 +97,6 @@ static void fillBuffer_fromHandle(buffer_t* buff, FILE* f)
buff->size = readSize; buff->size = readSize;
} }
/* @return : kBuffNull if any error */
static buffer_t createBuffer_fromHandle(FILE* f, size_t bufferSize)
{
buffer_t buff = createBuffer(bufferSize);
if (buff.ptr == NULL) return kBuffNull;
fillBuffer_fromHandle(&buff, f);
if (buff.size != buff.capacity) {
freeBuffer(buff);
return kBuffNull;
}
return buff;
}
/* @return : kBuffNull if any error */ /* @return : kBuffNull if any error */
static buffer_t createBuffer_fromFile(const char* fileName) static buffer_t createBuffer_fromFile(const char* fileName)
@ -118,16 +107,22 @@ static buffer_t createBuffer_fromFile(const char* fileName)
if (fileSize == UTIL_FILESIZE_UNKNOWN) return kBuffNull; if (fileSize == UTIL_FILESIZE_UNKNOWN) return kBuffNull;
assert((U64)bufferSize == fileSize); /* check overflow */ assert((U64)bufferSize == fileSize); /* check overflow */
{ buffer_t buff; { FILE* const f = fopen(fileName, "rb");
FILE* const f = fopen(fileName, "rb");
if (f == NULL) return kBuffNull; if (f == NULL) return kBuffNull;
buff = createBuffer_fromHandle(f, bufferSize); buffer_t buff = createBuffer(bufferSize);
CONTROL(buff.ptr != NULL);
fillBuffer_fromHandle(&buff, f);
CONTROL(buff.size == buff.capacity);
fclose(f); /* do nothing specific if fclose() fails */ fclose(f); /* do nothing specific if fclose() fails */
return buff; return buff;
} }
} }
/* @return : kBuffNull if any error */
static buffer_t static buffer_t
createDictionaryBuffer(const char* dictionaryName, createDictionaryBuffer(const char* dictionaryName,
const void* srcBuffer, const void* srcBuffer,
@ -136,7 +131,7 @@ createDictionaryBuffer(const char* dictionaryName,
{ {
if (dictionaryName) { if (dictionaryName) {
DISPLAYLEVEL(3, "loading dictionary %s \n", dictionaryName); DISPLAYLEVEL(3, "loading dictionary %s \n", dictionaryName);
return createBuffer_fromFile(dictionaryName); return createBuffer_fromFile(dictionaryName); /* note : result might be kBuffNull */
} else { } else {
@ -172,11 +167,11 @@ static int loadFiles(void* buffer, size_t bufferSize,
for (unsigned n=0; n<nbFiles; n++) { for (unsigned n=0; n<nbFiles; n++) {
U64 fileSize = UTIL_getFileSize(fileNamesTable[n]); U64 fileSize = UTIL_getFileSize(fileNamesTable[n]);
if (UTIL_isDirectory(fileNamesTable[n])) { if (UTIL_isDirectory(fileNamesTable[n])) {
fileSizes[n] = 0; fileSize = 0; fileSizes[n] = 0;
continue; continue;
} }
if (fileSize == UTIL_FILESIZE_UNKNOWN) { if (fileSize == UTIL_FILESIZE_UNKNOWN) {
fileSizes[n] = 0; fileSize = 0; fileSizes[n] = 0;
continue; continue;
} }
@ -336,6 +331,7 @@ createBufferCollection_fromFiles(const char* const * fileNamesTable, unsigned nb
U64 const totalSizeToLoad = UTIL_getTotalFileSize(fileNamesTable, nbFiles); U64 const totalSizeToLoad = UTIL_getTotalFileSize(fileNamesTable, nbFiles);
assert(totalSizeToLoad <= BENCH_SIZE_MAX); assert(totalSizeToLoad <= BENCH_SIZE_MAX);
size_t const loadedSize = (size_t)totalSizeToLoad; size_t const loadedSize = (size_t)totalSizeToLoad;
assert(loadedSize > 0);
void* const srcBuffer = malloc(loadedSize); void* const srcBuffer = malloc(loadedSize);
assert(srcBuffer != NULL); assert(srcBuffer != NULL);
@ -777,5 +773,10 @@ int main (int argc, const char** argv)
filenameTable = UTIL_createFileList(nameTable, nameIdx, &buffer_containing_filenames, &nbFiles, 1 /* follow_links */); filenameTable = UTIL_createFileList(nameTable, nameIdx, &buffer_containing_filenames, &nbFiles, 1 /* follow_links */);
} }
return bench(filenameTable, nbFiles, dictionary, blockSize, cLevel, nbDicts, nbRounds); int result = bench(filenameTable, nbFiles, dictionary, blockSize, cLevel, nbDicts, nbRounds);
free(buffer_containing_filenames);
free(nameTable);
return result;
} }