ZSTD_ prefix mem{cpy,move,set},malloc,calloc,free

This commit is contained in:
Nick Terrell
2020-08-26 12:26:03 -07:00
parent a686d306d2
commit c465f24457
25 changed files with 192 additions and 178 deletions
+5 -5
View File
@@ -14,7 +14,7 @@
* Dependencies
***************************************/
#define ZSTD_DEPS_NEED_MALLOC
#include "zstd_deps.h" /* malloc, calloc, free, memset */
#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */
#include "error_private.h"
#include "zstd_internal.h"
@@ -57,7 +57,7 @@ void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem)
{
if (customMem.customAlloc)
return customMem.customAlloc(customMem.opaque, size);
return malloc(size);
return ZSTD_malloc(size);
}
void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem)
@@ -66,10 +66,10 @@ void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem)
/* calloc implemented as malloc+memset;
* not as efficient as calloc, but next best guess for custom malloc */
void* const ptr = customMem.customAlloc(customMem.opaque, size);
memset(ptr, 0, size);
ZSTD_memset(ptr, 0, size);
return ptr;
}
return calloc(1, size);
return ZSTD_calloc(1, size);
}
void ZSTD_customFree(void* ptr, ZSTD_customMem customMem)
@@ -78,6 +78,6 @@ void ZSTD_customFree(void* ptr, ZSTD_customMem customMem)
if (customMem.customFree)
customMem.customFree(customMem.opaque, ptr);
else
free(ptr);
ZSTD_free(ptr);
}
}