mirror of
https://github.com/facebook/zstd.git
synced 2025-11-05 07:50:38 +03:00
Merge pull request #4516 from Cyan4973/mingw_calloc_order
minor: fix mingw warnings: calloc argument order
This commit is contained in:
@@ -1242,7 +1242,7 @@ static int createBuffers(buffers_t* buff, const char* const * const fileNamesTab
|
|||||||
size_t n;
|
size_t n;
|
||||||
size_t totalSizeToLoad = (size_t)UTIL_getTotalFileSize(fileNamesTable, (U32)nbFiles);
|
size_t totalSizeToLoad = (size_t)UTIL_getTotalFileSize(fileNamesTable, (U32)nbFiles);
|
||||||
size_t benchedSize = MIN(BMK_findMaxMem(totalSizeToLoad * 3) / 3, totalSizeToLoad);
|
size_t benchedSize = MIN(BMK_findMaxMem(totalSizeToLoad * 3) / 3, totalSizeToLoad);
|
||||||
size_t* fileSizes = calloc(sizeof(size_t), nbFiles);
|
size_t* fileSizes = calloc(nbFiles, sizeof(size_t));
|
||||||
void* srcBuffer = NULL;
|
void* srcBuffer = NULL;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
@@ -1457,7 +1457,7 @@ createMemoTableArray(const paramValues_t p,
|
|||||||
const size_t varyLen,
|
const size_t varyLen,
|
||||||
const U32 memoTableLog)
|
const U32 memoTableLog)
|
||||||
{
|
{
|
||||||
memoTable_t* const mtAll = (memoTable_t*)calloc(sizeof(memoTable_t),(ZSTD_STRATEGY_MAX + 1));
|
memoTable_t* const mtAll = (memoTable_t*)calloc((ZSTD_STRATEGY_MAX + 1), sizeof(memoTable_t));
|
||||||
ZSTD_strategy i, stratMin = ZSTD_STRATEGY_MIN, stratMax = ZSTD_STRATEGY_MAX;
|
ZSTD_strategy i, stratMin = ZSTD_STRATEGY_MIN, stratMax = ZSTD_STRATEGY_MAX;
|
||||||
|
|
||||||
if(mtAll == NULL) {
|
if(mtAll == NULL) {
|
||||||
@@ -1494,7 +1494,7 @@ createMemoTableArray(const paramValues_t p,
|
|||||||
mtl = ((size_t)1 << memoTableLog);
|
mtl = ((size_t)1 << memoTableLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
mtAll[i].table = (BYTE*)calloc(sizeof(BYTE), mtl);
|
mtAll[i].table = (BYTE*)calloc(mtl, sizeof(BYTE));
|
||||||
mtAll[i].tableLen = mtl;
|
mtAll[i].tableLen = mtl;
|
||||||
|
|
||||||
if(mtAll[i].table == NULL) {
|
if(mtAll[i].table == NULL) {
|
||||||
|
|||||||
Reference in New Issue
Block a user