removed calloc calls from lib/

diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c
index a1004fba35860d2763d13a0c46c66e7c69d664e1..05cf69657959aa5b537dfa81d265a0c6def03d87 100644 (file)
--- a/lib/compress/huf_compress.c
+++ b/lib/compress/huf_compress.c
@@ -59,7 +59,6 @@
 /* **************************************************************
 *  Includes
 ****************************************************************/
-#include <stdlib.h>     /* malloc, free, qsort */
 #include <string.h>     /* memcpy, memset */
 #include <stdio.h>      /* printf (debug) */
 #include "huf_static.h"

diff --git a/lib/compress/zbuff_compress.c b/lib/compress/zbuff_compress.c
index 0ec27ad707943cfe49bfbeb14cf959213ab3249b..1681bc84a7b100555ea8c4cef1cbef1c7921bbce 100644 (file)
--- a/lib/compress/zbuff_compress.c
+++ b/lib/compress/zbuff_compress.c
@@ -108,13 +108,7 @@ ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem)
     ZBUFF_CCtx* zbc;
 
     if (!customMem.customAlloc && !customMem.customFree)
-    {
-        zbc = (ZBUFF_CCtx*)calloc(1, sizeof(ZBUFF_CCtx));
-        if (zbc==NULL) return NULL;
-        memcpy(&zbc->customMem, &defaultCustomMem, sizeof(ZSTD_customMem));
-        zbc->zc = ZSTD_createCCtx();
-        return zbc;
-    }
+        customMem = defaultCustomMem;
 
     if (!customMem.customAlloc || !customMem.customFree)
         return NULL;

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 93caee0d7d67e53639d86343983b15ad7a64e1fc..3196916f92c08038f913da2df8dee3055b60acb8 100644 (file)
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -51,7 +51,6 @@
 /*-*************************************
 *  Dependencies
 ***************************************/
-#include <stdlib.h>      /* malloc */
 #include <string.h>      /* memset */
 #include "mem.h"
 #define XXH_STATIC_LINKING_ONLY   /* XXH64_state_t */
@@ -130,12 +129,7 @@ ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
     ZSTD_CCtx* ctx;
 
     if (!customMem.customAlloc && !customMem.customFree)
-    {
-        ctx = (ZSTD_CCtx*) calloc(1, sizeof(ZSTD_CCtx));
-        if (!ctx) return NULL;
-        memcpy(&ctx->customMem, &defaultCustomMem, sizeof(ZSTD_customMem));
-        return ctx;
-    }
+        customMem = defaultCustomMem;
 
     if (!customMem.customAlloc || !customMem.customFree)
         return NULL;

diff --git a/lib/decompress/huf_decompress.c b/lib/decompress/huf_decompress.c
index 01e9c07b2fa140acb782af36b00e4ffdf37fdbf9..14afbb927c26736f2b4cfeda28ecba6e269e65ab 100644 (file)
--- a/lib/decompress/huf_decompress.c
+++ b/lib/decompress/huf_decompress.c
@@ -59,7 +59,6 @@
 /* **************************************************************
 *  Includes
 ****************************************************************/
-#include <stdlib.h>     /* malloc, free, qsort */
 #include <string.h>     /* memcpy, memset */
 #include <stdio.h>      /* printf (debug) */
 #include "huf_static.h"

diff --git a/lib/decompress/zbuff_decompress.c b/lib/decompress/zbuff_decompress.c
index 4dfb2adae42df603ecffd6616f815c4197988525..01fcc217f0d672c87657bb1895e930a4596714e7 100644 (file)
--- a/lib/decompress/zbuff_decompress.c
+++ b/lib/decompress/zbuff_decompress.c
@@ -96,14 +96,7 @@ ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem)
     ZBUFF_DCtx* zbd;
 
     if (!customMem.customAlloc && !customMem.customFree)
-    {
-        zbd = (ZBUFF_DCtx*)calloc(1, sizeof(ZBUFF_DCtx));
-        if (zbd==NULL) return NULL;
-        memcpy(&zbd->customMem, &defaultCustomMem, sizeof(ZSTD_customMem));
-        zbd->zd = ZSTD_createDCtx();
-        zbd->stage = ZBUFFds_init;
-        return zbd;
-    }
+        customMem = defaultCustomMem;
 
     if (!customMem.customAlloc || !customMem.customFree)
         return NULL;

diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index d4426bccab9eeba0f17dac4dbdea442cf38d809b..495e8d296e6cc5ad76d3d81f2f28d251513d86fe 100644 (file)
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -53,7 +53,6 @@
 /*-*******************************************************
 *  Dependencies
 *********************************************************/
-#include <stdlib.h>      /* calloc */
 #include <string.h>      /* memcpy, memmove */
 #include <stdio.h>       /* debug only : printf */
 #include "mem.h"         /* low level memory routines */
@@ -152,13 +151,8 @@ ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem)
 {
     ZSTD_DCtx* dctx;
 
-    if (!customMem.customAlloc && !customMem.customFree) {
-        dctx = (ZSTD_DCtx*) malloc(sizeof(ZSTD_DCtx));
-        if (!dctx) return NULL;
-        memcpy(&dctx->customMem, &defaultCustomMem, sizeof(ZSTD_customMem));
-        ZSTD_decompressBegin(dctx);
-        return dctx;
-    }
+    if (!customMem.customAlloc && !customMem.customFree)
+        customMem = defaultCustomMem;
 
     if (!customMem.customAlloc || !customMem.customFree)
         return NULL;

diff --git a/programs/zbufftest.c b/programs/zbufftest.c
index 37a94179127f1019e4330c3ac5f09d03fef53b2f..387119815ed12dd9edf490c7e2b8139de9b29ea0 100644 (file)
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@ -521,6 +521,7 @@ int main(int argc, const char** argv)
     U32 mainPause = 0;
     const char* programName = argv[0];
     ZSTD_customMem customMem = { ZBUFF_allocFunction, ZBUFF_freeFunction, NULL };
+    ZSTD_customMem customNULL = { NULL, NULL, NULL };
 
     /* Check command line */
     for(argNb=1; argNb<argc; argNb++) {
@@ -620,7 +621,7 @@ int main(int argc, const char** argv)
     if (nbTests<=0) nbTests=1;
 
     if (testNb==0) {
-        result = basicUnitTests(0, ((double)proba) / 100, defaultCustomNULL);  /* constant seed for predictability */
+        result = basicUnitTests(0, ((double)proba) / 100, customNULL);  /* constant seed for predictability */
         if (!result) {
             DISPLAYLEVEL(4, "Unit tests using customMem :\n")
             result = basicUnitTests(0, ((double)proba) / 100, customMem);  /* use custom memory allocation functions */