Index: third_party/zlib/zutil.c |
diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c |
index 23d2ebef008fdcc00833eba0d9abcd7b9c665531..a76c6b0c7e557f8c29cfcf58a5ef9ef79c5e4e8a 100644 |
--- a/third_party/zlib/zutil.c |
+++ b/third_party/zlib/zutil.c |
@@ -1,5 +1,5 @@ |
/* zutil.c -- target dependent utility functions for the compression library |
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. |
+ * Copyright (C) 1995-2017 Jean-loup Gailly |
* For conditions of distribution and use, see copyright notice in zlib.h |
*/ |
@@ -10,21 +10,18 @@ |
# include "gzguts.h" |
#endif |
-#ifndef NO_DUMMY_DECL |
-struct internal_state {int dummy;}; /* for buggy compilers */ |
-#endif |
- |
z_const char * const z_errmsg[10] = { |
-"need dictionary", /* Z_NEED_DICT 2 */ |
-"stream end", /* Z_STREAM_END 1 */ |
-"", /* Z_OK 0 */ |
-"file error", /* Z_ERRNO (-1) */ |
-"stream error", /* Z_STREAM_ERROR (-2) */ |
-"data error", /* Z_DATA_ERROR (-3) */ |
-"insufficient memory", /* Z_MEM_ERROR (-4) */ |
-"buffer error", /* Z_BUF_ERROR (-5) */ |
-"incompatible version",/* Z_VERSION_ERROR (-6) */ |
-""}; |
+ (z_const char *)"need dictionary", /* Z_NEED_DICT 2 */ |
+ (z_const char *)"stream end", /* Z_STREAM_END 1 */ |
+ (z_const char *)"", /* Z_OK 0 */ |
+ (z_const char *)"file error", /* Z_ERRNO (-1) */ |
+ (z_const char *)"stream error", /* Z_STREAM_ERROR (-2) */ |
+ (z_const char *)"data error", /* Z_DATA_ERROR (-3) */ |
+ (z_const char *)"insufficient memory", /* Z_MEM_ERROR (-4) */ |
+ (z_const char *)"buffer error", /* Z_BUF_ERROR (-5) */ |
+ (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */ |
+ (z_const char *)"" |
+}; |
const char * ZEXPORT zlibVersion() |
@@ -61,7 +58,7 @@ uLong ZEXPORT zlibCompileFlags() |
case 8: flags += 2 << 6; break; |
default: flags += 3 << 6; |
} |
-#ifdef DEBUG |
+#ifdef ZLIB_DEBUG |
flags += 1 << 8; |
#endif |
#if defined(ASMV) || defined(ASMINF) |
@@ -115,8 +112,8 @@ uLong ZEXPORT zlibCompileFlags() |
return flags; |
} |
-#ifdef DEBUG |
- |
+#ifdef ZLIB_DEBUG |
+#include <stdlib.h> |
# ifndef verbose |
# define verbose 0 |
# endif |
@@ -219,9 +216,11 @@ local ptr_table table[MAX_PTR]; |
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) |
{ |
- voidpf buf = opaque; /* just to make some compilers happy */ |
+ voidpf buf; |
ulg bsize = (ulg)items*size; |
+ (void)opaque; |
+ |
/* If we allocate less than 65520 bytes, we assume that farmalloc |
* will return a usable pointer which doesn't have to be normalized. |
*/ |
@@ -244,6 +243,9 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) |
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) |
{ |
int n; |
+ |
+ (void)opaque; |
+ |
if (*(ush*)&ptr != 0) { /* object < 64K */ |
farfree(ptr); |
return; |
@@ -259,7 +261,6 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) |
next_ptr--; |
return; |
} |
- ptr = opaque; /* just to make some compilers happy */ |
Assert(0, "zcfree: ptr not found"); |
} |
@@ -278,13 +279,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) |
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) |
{ |
- if (opaque) opaque = 0; /* to make compiler happy */ |
+ (void)opaque; |
return _halloc((long)items, size); |
} |
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) |
{ |
- if (opaque) opaque = 0; /* to make compiler happy */ |
+ (void)opaque; |
_hfree(ptr); |
} |
@@ -306,7 +307,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) |
unsigned items; |
unsigned size; |
{ |
- if (opaque) items += size - size; /* make compiler happy */ |
+ (void)opaque; |
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : |
(voidpf)calloc(items, size); |
} |
@@ -315,8 +316,8 @@ void ZLIB_INTERNAL zcfree (opaque, ptr) |
voidpf opaque; |
voidpf ptr; |
{ |
+ (void)opaque; |
free(ptr); |
- if (opaque) return; /* make compiler happy */ |
} |
#endif /* MY_ZCALLOC */ |