From 614fddee6a71d460844de3f31057f5dcc9f9ea81 Mon Sep 17 00:00:00 2001
From: inikep <inikep@gmail.com>
Date: Thu, 2 Jun 2016 18:40:41 +0200
Subject: [PATCH] zlibWrapper: support for stricter gcc warnings

---
 zlibWrapper/Makefile           |  3 ++-
 zlibWrapper/examples/example.c |  2 +-
 zlibWrapper/zstd_zlibwrapper.c | 12 ++++++------
 zlibWrapper/zstd_zlibwrapper.h |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index 6c00622b0..962f92941 100644
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -18,7 +18,8 @@ endif
 ZLIBWRAPPER_PATH = .
 EXAMPLE_PATH = examples
 CC = gcc
-CFLAGS = $(LOC) -I../lib/common -I$(ZLIBDIR) -I$(ZLIBWRAPPER_PATH) -O3 -Wall -std=gnu89
+CFLAGS = $(LOC) -I../lib/common -I$(ZLIBDIR) -I$(ZLIBWRAPPER_PATH) -O3 -std=gnu90
+CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wstrict-prototypes -Wundef
 LDFLAGS = $(LOC)
 RM = rm -f
 
diff --git a/zlibWrapper/examples/example.c b/zlibWrapper/examples/example.c
index 3fea9d2ad..a2836cdbf 100644
--- a/zlibWrapper/examples/example.c
+++ b/zlibWrapper/examples/example.c
@@ -61,8 +61,8 @@ void *myalloc(q, n, m)
     void *q;
     unsigned n, m;
 {
-    q = Z_NULL;
     void *buf = calloc(n, m);
+    q = Z_NULL;
   /*  printf("myalloc %p n=%d m=%d\n", buf, n, m); */
     return buf;
 }
diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index b55b760af..4740e0dbd 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -69,9 +69,9 @@ static int g_useZSTD = ZWRAP_USE_ZSTD;   /* 0 = don't use ZSTD */
 
 void useZSTD(int turn_on) { g_useZSTD = turn_on; }
 
-int isUsingZSTD() { return g_useZSTD; }
+int isUsingZSTD(void) { return g_useZSTD; }
 
-const char * zstdVersion() { return ZSTD_VERSION_STRING; }
+const char * zstdVersion(void) { return ZSTD_VERSION_STRING; }
 
 ZEXTERN const char * ZEXPORT z_zlibVersion OF((void)) { return zlibVersion();  }
 
@@ -421,8 +421,8 @@ ZEXTERN int ZEXPORT z_inflate OF((z_streamp strm, int flush))
                 strm->avail_out = strm2.avail_out;
 
                 strm->reserved = 0; /* mark as zlib stream */
-                { size_t const errorCode = ZWRAP_freeDCtx(zwd);
-                  if (ZSTD_isError(errorCode)) return Z_MEM_ERROR; }
+                errorCode = ZWRAP_freeDCtx(zwd);
+                if (ZSTD_isError(errorCode)) return Z_MEM_ERROR;
 
                 if (flush == Z_INFLATE_SYNC) return inflateSync(strm);
                 return inflate(strm, flush);
@@ -434,8 +434,8 @@ ZEXTERN int ZEXPORT z_inflate OF((z_streamp strm, int flush))
             } else
                zwd->zbd = ZBUFF_createDCtx();
 
-            { size_t const errorCode = ZBUFF_decompressInit(zwd->zbd);
-              if (ZSTD_isError(errorCode)) return Z_MEM_ERROR; }
+            errorCode = ZBUFF_decompressInit(zwd->zbd);
+            if (ZSTD_isError(errorCode)) return Z_MEM_ERROR;
 
             srcSize = ZWRAP_HEADERSIZE;
             dstCapacity = 0;
diff --git a/zlibWrapper/zstd_zlibwrapper.h b/zlibWrapper/zstd_zlibwrapper.h
index e438789ac..d14c3a92a 100644
--- a/zlibWrapper/zstd_zlibwrapper.h
+++ b/zlibWrapper/zstd_zlibwrapper.h
@@ -49,8 +49,8 @@ extern "C" {
 #endif
 
 void useZSTD(int turn_on);
-int isUsingZSTD();
-const char * zstdVersion();
+int isUsingZSTD(void);
+const char * zstdVersion(void);
 
 
 #if defined (__cplusplus)