diff options
author | delphij <delphij@FreeBSD.org> | 2017-02-16 06:16:23 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2017-02-16 06:16:23 +0000 |
commit | 1774b65ac65bd325f1ed5574e97f07c422efd662 (patch) | |
tree | 6f729a2069240571a4a4aafcb022b461e2b8dc7d /contrib/zlib/test/minigzip.c | |
parent | a4e15bbaf3afbd4ebf2a97ba0b2073dd091ebb87 (diff) | |
download | FreeBSD-src-1774b65ac65bd325f1ed5574e97f07c422efd662.zip FreeBSD-src-1774b65ac65bd325f1ed5574e97f07c422efd662.tar.gz |
MFC r311285,312335: zlib 1.2.11.
Diffstat (limited to 'contrib/zlib/test/minigzip.c')
-rw-r--r-- | contrib/zlib/test/minigzip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/zlib/test/minigzip.c b/contrib/zlib/test/minigzip.c index b3025a4..e22fb08 100644 --- a/contrib/zlib/test/minigzip.c +++ b/contrib/zlib/test/minigzip.c @@ -1,5 +1,5 @@ /* minigzip.c -- simulate gzip using the zlib compression library - * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly. + * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -40,7 +40,7 @@ # define SET_BINARY_MODE(file) #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 # define snprintf _snprintf #endif @@ -156,14 +156,14 @@ void *myalloc(q, n, m) void *q; unsigned n, m; { - q = Z_NULL; + (void)q; return calloc(n, m); } void myfree(q, p) void *q, *p; { - q = Z_NULL; + (void)q; free(p); } @@ -333,7 +333,7 @@ const char *gzerror(gz, err) #endif -char *prog; +static char *prog; void error OF((const char *msg)); void gz_compress OF((FILE *in, gzFile out)); @@ -500,7 +500,7 @@ void file_uncompress(file) char *infile, *outfile; FILE *out; gzFile in; - size_t len = strlen(file); + unsigned len = strlen(file); if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) { fprintf(stderr, "%s: filename too long\n", prog); |