From ff11b0a61f7345572ff2e413173d3179486162f2 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:17:02 -0700 Subject: zlib 1.0.4 --- gzio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gzio.c') diff --git a/gzio.c b/gzio.c index 44ca9e8..6c82677 100644 --- a/gzio.c +++ b/gzio.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id: gzio.c,v 1.13 1996/05/22 11:52:24 me Exp $ */ +/* $Id: gzio.c,v 1.14 1996/07/24 13:41:01 me Exp $ */ #include @@ -496,7 +496,7 @@ int gzclose (file) errnum is set to Z_ERRNO and the application may consult errno to get the exact error code. */ -char* gzerror (file, errnum) +const char* gzerror (file, errnum) gzFile file; int *errnum; { @@ -505,19 +505,19 @@ char* gzerror (file, errnum) if (s == NULL) { *errnum = Z_STREAM_ERROR; - return ERR_MSG(Z_STREAM_ERROR); + return (const char*)ERR_MSG(Z_STREAM_ERROR); } *errnum = s->z_err; - if (*errnum == Z_OK) return (char*)""; + if (*errnum == Z_OK) return (const char*)""; m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); - if (m == NULL || *m == '\0') m = ERR_MSG(s->z_err); + if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); TRYFREE(s->msg); s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); strcpy(s->msg, s->path); strcat(s->msg, ": "); strcat(s->msg, m); - return s->msg; + return (const char*)s->msg; } -- cgit v1.2.3-55-g6feb