From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 4 Oct 2015 18:45:00 +0000 (-0700)
Subject: Use a consistent and more modern approach to not use a parameter.
X-Git-Tag: 1.9.9-b1~793^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a123d5884699ff685cf04e5e5a593ffd04577fd;p=thirdparty%2Fzlib-ng.git

Use a consistent and more modern approach to not use a parameter.

A remarkably creative and diverse set of approaches to letting the
compiler know that opaque was being used when it wasn't is changed
by this commit to the more standard (void)opaque.

 Conflicts:
	zutil.c
---

diff --git a/zutil.c b/zutil.c
index d9fda0983..02b9ccfcd 100644
--- a/zutil.c
+++ b/zutil.c
@@ -110,15 +110,15 @@ const char * ZEXPORT zError(int err)
 
 void ZLIB_INTERNAL *zcalloc (void *opaque, unsigned items, unsigned size)
 {
-    if (opaque) items += size - size; /* make compiler happy */
+    (void)opaque;
     return sizeof(uInt) > 2 ? (void *)malloc(items * size) :
                               (void *)calloc(items, size);
 }
 
 void ZLIB_INTERNAL zcfree (void *opaque, void *ptr)
 {
+    (void)opaque;
     free(ptr);
-    if (opaque) return; /* make compiler happy */
 }
 
 #endif /* MY_ZCALLOC */