From: inikep <inikep@gmail.com>
Date: Fri, 3 Jun 2016 11:28:20 +0000 (+0200)
Subject: defaultCustomNULL replaced with defaultCustomMem
X-Git-Tag: v0.7.0^2~49^2~21^2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3763c77f6b5bbbcd9ce1a764be73bacbb89581f4;p=thirdparty%2Fzstd.git

defaultCustomNULL replaced with defaultCustomMem
---

diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h
index b56030ba5..8432c1dd1 100644
--- a/lib/common/zstd_internal.h
+++ b/lib/common/zstd_internal.h
@@ -259,6 +259,5 @@ int ZSTD_isSkipFrame(ZSTD_DCtx* dctx);
 void* ZSTD_defaultAllocFunction(void* opaque, size_t size);
 void ZSTD_defaultFreeFunction(void* opaque, void* address);
 static ZSTD_customMem const defaultCustomMem = { ZSTD_defaultAllocFunction, ZSTD_defaultFreeFunction, NULL };
-static ZSTD_customMem const defaultCustomNULL = { NULL, NULL, NULL };
-    
+ 
 #endif   /* ZSTD_CCOMMON_H_MODULE */
diff --git a/lib/compress/zbuff_compress.c b/lib/compress/zbuff_compress.c
index 1681bc84a..0340eeb35 100644
--- a/lib/compress/zbuff_compress.c
+++ b/lib/compress/zbuff_compress.c
@@ -100,7 +100,7 @@ struct ZBUFF_CCtx_s {
 
 ZBUFF_CCtx* ZBUFF_createCCtx(void)
 {
-    return ZBUFF_createCCtx_advanced(defaultCustomNULL);
+    return ZBUFF_createCCtx_advanced(defaultCustomMem);
 }
 
 ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem)
diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 3196916f9..68a6072e8 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -121,7 +121,7 @@ struct ZSTD_CCtx_s
 
 ZSTD_CCtx* ZSTD_createCCtx(void)
 {
-    return ZSTD_createCCtx_advanced(defaultCustomNULL);
+    return ZSTD_createCCtx_advanced(defaultCustomMem);
 }
 
 ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
diff --git a/lib/decompress/zbuff_decompress.c b/lib/decompress/zbuff_decompress.c
index 01fcc217f..e9e84ef7c 100644
--- a/lib/decompress/zbuff_decompress.c
+++ b/lib/decompress/zbuff_decompress.c
@@ -88,7 +88,7 @@ struct ZBUFF_DCtx_s {
 
 ZBUFF_DCtx* ZBUFF_createDCtx(void)
 {
-    return ZBUFF_createDCtx_advanced(defaultCustomNULL);
+    return ZBUFF_createDCtx_advanced(defaultCustomMem);
 }
 
 ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem)
diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index 495e8d296..128d941eb 100644
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -166,7 +166,7 @@ ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem)
 
 ZSTD_DCtx* ZSTD_createDCtx(void)
 {
-    return ZSTD_createDCtx_advanced(defaultCustomNULL);
+    return ZSTD_createDCtx_advanced(defaultCustomMem);
 }