summaryrefslogtreecommitdiff
path: root/zutil.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2015-10-04 11:45:00 -0700
committerHans Kristian Rosbach <hk-git@circlestorm.org>2015-11-03 19:16:23 +0100
commit9a123d5884699ff685cf04e5e5a593ffd04577fd (patch)
tree1a8092a67d3b632284d75b738429ca1198a2cb59 /zutil.c
parente5bc072326c5dc92ade2e336c63a11ee44238626 (diff)
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
Diffstat (limited to 'zutil.c')
-rw-r--r--zutil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zutil.c b/zutil.c
index d9fda09..02b9ccf 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 */