From: inikep <inikep@gmail.com>
Date: Thu, 2 Jun 2016 16:24:07 +0000 (+0200)
Subject: ZWRAP_allocFunction and ZWRAP_freeFunction are static
X-Git-Tag: v0.7.0^2~49^2~21^2^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cab86f6470184ca72dbfdeba6a9cbaad6d7b04d;p=thirdparty%2Fzstd.git

ZWRAP_allocFunction and ZWRAP_freeFunction are static
---

diff --git a/Makefile b/Makefile
index db58d430c..c8b5831ba 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ ppctest: clean
 
 # for Travis CI
 ppcinstall: clean
-	sudo apt-get update  -y -q
+	# sudo apt-get update  -y -q
 	sudo apt-get install -y -q qemu-system-ppc binfmt-support qemu-user-static gcc-powerpc-linux-gnu  # doesn't work with Ubuntu 12.04
 
 # for Travis CI
diff --git a/programs/zbufftest.c b/programs/zbufftest.c
index 18382abf9..b1d5b47c5 100644
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@ -129,7 +129,7 @@ static unsigned FUZ_highbit32(U32 v32)
 }
 */
 
-void* ZBUFF_allocFunction(void* opaque, size_t size)
+static void* ZBUFF_allocFunction(void* opaque, size_t size)
 {
     (void)opaque;
     void* address = malloc(size);
@@ -137,7 +137,7 @@ void* ZBUFF_allocFunction(void* opaque, size_t size)
     return address;
 }
 
-void ZBUFF_freeFunction(void* opaque, void* address)
+static void ZBUFF_freeFunction(void* opaque, void* address)
 {
     (void)opaque;
     /* if (address) DISPLAYLEVEL(4, "free %p opaque=%p \n", address, opaque); */
@@ -514,7 +514,7 @@ int main(int argc, const char** argv)
     int result=0;
     U32 mainPause = 0;
     const char* programName = argv[0];
-    ZSTD_customMem customMem = { ZBUFF_allocFunction, ZBUFF_freeFunction, (void*)777 };
+    ZSTD_customMem customMem = { ZBUFF_allocFunction, ZBUFF_freeFunction, NULL };
     ZSTD_customMem customNULL = { NULL, NULL, NULL };
 
     /* Check command line */
diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index 26f173b13..b55b760af 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -76,7 +76,7 @@ const char * zstdVersion() { return ZSTD_VERSION_STRING; }
 ZEXTERN const char * ZEXPORT z_zlibVersion OF((void)) { return zlibVersion();  }
 
 
-void* ZWRAP_allocFunction(void* opaque, size_t size)
+static void* ZWRAP_allocFunction(void* opaque, size_t size)
 {
     z_streamp strm = (z_streamp) opaque;
     void* address = strm->zalloc(strm->opaque, 1, size);
@@ -84,7 +84,7 @@ void* ZWRAP_allocFunction(void* opaque, size_t size)
     return address;
 }
 
-void ZWRAP_freeFunction(void* opaque, void* address)
+static void ZWRAP_freeFunction(void* opaque, void* address)
 {
     z_streamp strm = (z_streamp) opaque;
     strm->zfree(strm->opaque, address);