aboutsummaryrefslogtreecommitdiff
path: root/zlib/gzread.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 13:48:44 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 13:51:05 +0100
commit4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (patch)
treeee8a24a92b267f48542eaed1968266a76e945a27 /zlib/gzread.c
parentb73c544c61712f7bd57f3c9a0f6046481f58038b (diff)
downloadvcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.tar.gz
vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.tar.bz2
vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.zip
Updated zlib to 1.2.8
Diffstat (limited to 'zlib/gzread.c')
-rw-r--r--zlib/gzread.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/zlib/gzread.c b/zlib/gzread.c
index 3493d34d4..bf4538eb2 100644
--- a/zlib/gzread.c
+++ b/zlib/gzread.c
@@ -1,5 +1,5 @@
/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -58,7 +58,8 @@ local int gz_avail(state)
return -1;
if (state->eof == 0) {
if (strm->avail_in) { /* copy what's there to the start */
- unsigned char *p = state->in, *q = strm->next_in;
+ unsigned char *p = state->in;
+ unsigned const char *q = strm->next_in;
unsigned n = strm->avail_in;
do {
*p++ = *q++;
@@ -90,8 +91,8 @@ local int gz_look(state)
/* allocate read buffers and inflate memory */
if (state->size == 0) {
/* allocate buffers */
- state->in = malloc(state->want);
- state->out = malloc(state->want << 1);
+ state->in = (unsigned char *)malloc(state->want);
+ state->out = (unsigned char *)malloc(state->want << 1);
if (state->in == NULL || state->out == NULL) {
if (state->out != NULL)
free(state->out);
@@ -352,14 +353,14 @@ int ZEXPORT gzread(file, buf, len)
/* large len -- read directly into user buffer */
else if (state->how == COPY) { /* read directly */
- if (gz_load(state, buf, len, &n) == -1)
+ if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
return -1;
}
/* large len -- decompress directly into user buffer */
else { /* state->how == GZIP */
strm->avail_out = len;
- strm->next_out = buf;
+ strm->next_out = (unsigned char *)buf;
if (gz_decomp(state) == -1)
return -1;
n = state->x.have;
@@ -378,7 +379,11 @@ int ZEXPORT gzread(file, buf, len)
}
/* -- see zlib.h -- */
-#undef gzgetc
+#ifdef Z_PREFIX_SET
+# undef z_gzgetc
+#else
+# undef gzgetc
+#endif
int ZEXPORT gzgetc(file)
gzFile file;
{
@@ -518,7 +523,7 @@ char * ZEXPORT gzgets(file, buf, len)
/* look for end-of-line in current output buffer */
n = state->x.have > left ? left : state->x.have;
- eol = memchr(state->x.next, '\n', n);
+ eol = (unsigned char *)memchr(state->x.next, '\n', n);
if (eol != NULL)
n = (unsigned)(eol - state->x.next) + 1;