commit 793ad7f559555757e6443ea591ce70de5505fc69
author Mark Adler <madler@alumni.caltech.edu> Sat Feb 11 22:45:27 2017 -0800
committer Mark Adler <madler@alumni.caltech.edu> Wed Feb 15 22:39:26 2017 -0800
tree 5dcbb55465c3d28237521bd7134d1d60a095ce42
parent e00a2bd392ca51351ecee55dbeee803f6ebda2f5

Avoid some conversion warnings in gzread.c and gzwrite.c.

gzread.c

diff --git a/gzread.c b/gzread.c
index 956b91e..f94abfe 100644
--- a/gzread.c
+++ b/gzread.c
@@ -314,9 +314,9 @@
     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 @@
     }
 
     /* 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 @@
 int ZEXPORT gzgetc(file)
     gzFile file;
 {
-    int ret;
     unsigned char buf[1];
     gz_statep state;
 
@@ -469,8 +468,7 @@
     }
 
     /* 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)

gzwrite.c

diff --git a/gzwrite.c b/gzwrite.c
index c7b5651..35b9aa6 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -209,7 +209,7 @@
                               state->in);
             copy = state->size - have;
             if (copy > len)
-                copy = len;
+                copy = (unsigned)len;
             memcpy(state->in + have, buf, copy);
             state->strm.avail_in += copy;
             state->x.pos += copy;
@@ -229,7 +229,7 @@
         do {
             unsigned n = (unsigned)-1;
             if (n > len)
-                n = len;
+                n = (unsigned)len;
             state->strm.avail_in = n;
             state->x.pos += n;
             if (gz_comp(state, Z_NO_FLUSH) == -1)