summaryrefslogtreecommitdiff
path: root/gzread.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2017-02-11 22:45:27 -0800
committerMark Adler <madler@alumni.caltech.edu>2017-02-15 22:39:26 -0800
commit793ad7f559555757e6443ea591ce70de5505fc69 (patch)
tree5dcbb55465c3d28237521bd7134d1d60a095ce42 /gzread.c
parente00a2bd392ca51351ecee55dbeee803f6ebda2f5 (diff)
downloadzlib-793ad7f559555757e6443ea591ce70de5505fc69.tar.gz
Avoid some conversion warnings in gzread.c and gzwrite.c.
Diffstat (limited to 'gzread.c')
-rw-r--r--gzread.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/gzread.c b/gzread.c
index 956b91e..f94abfe 100644
--- a/gzread.c
+++ b/gzread.c
@@ -314,9 +314,9 @@ local z_size_t gz_read(state, buf, len)
got = 0;
do {
/* set n to the maximum amount of len that fits in an unsigned int */
- n = -1;
+ n = (unsigned)-1;
if (n > len)
- n = len;
+ n = (unsigned)len;
/* first just try copying data from the output buffer */
if (state->x.have) {
@@ -397,7 +397,7 @@ int ZEXPORT gzread(file, buf, len)
}
/* read len or fewer bytes to buf */
- len = gz_read(state, buf, len);
+ len = (unsigned)gz_read(state, buf, len);
/* check for an error */
if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
@@ -447,7 +447,6 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
int ZEXPORT gzgetc(file)
gzFile file;
{
- int ret;
unsigned char buf[1];
gz_statep state;
@@ -469,8 +468,7 @@ int ZEXPORT gzgetc(file)
}
/* nothing there -- try gz_read() */
- ret = gz_read(state, buf, 1);
- return ret < 1 ? -1 : buf[0];
+ return gz_read(state, buf, 1) < 1 ? -1 : buf[0];
}
int ZEXPORT gzgetc_(file)