From: Mika Lindqvist <postmaster@raasu.org>
Date: Wed, 27 May 2015 20:55:35 +0000 (+0300)
Subject: minigzip: restructure gzread() to get rid of unnecessary temporary variables.
X-Git-Tag: 1.9.9-b1~793^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2103d455f8a7cfcaceb7bdf9e88f5c909f21ccb0;p=thirdparty%2Fzlib-ng.git

minigzip: restructure gzread() to get rid of unnecessary temporary variables.
---

diff --git a/test/minigzip.c b/test/minigzip.c
index 0907e2c9f..7279c0af9 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -172,13 +172,9 @@ int gzread (gzFile, void *, unsigned);
 
 int gzread(gzFile gz, void *buf, unsigned len)
 {
-    int ret;
-    size_t got;
     z_stream *strm;
 
-    if (gz == NULL || gz->write)
-        return 0;
-    if (gz->err)
+    if (gz == NULL || gz->write || gz->err)
         return 0;
     strm = &(gz->strm);
     strm->next_out = buf;
@@ -186,20 +182,22 @@ int gzread(gzFile gz, void *buf, unsigned len)
     do {
         if (strm->avail_in == 0)
         {
-            got = fread(gz->buf, 1, BUFLEN, gz->file);
-            if (got == 0)
-                break;
             strm->next_in = gz->buf;
-            strm->avail_in = (uInt) got;
+            strm->avail_in = (uInt)fread(gz->buf, 1, BUFLEN, gz->file);
         }
-        ret = inflate(strm, Z_NO_FLUSH);
-        if (ret == Z_DATA_ERROR) {
-            gz->err = Z_DATA_ERROR;
-            gz->msg = strm->msg;
-            return 0;
+        if (strm->avail_in > 0)
+        {
+            int ret = inflate(strm, Z_NO_FLUSH);
+            if (ret == Z_DATA_ERROR) {
+                gz->err = ret;
+                gz->msg = strm->msg;
+                return 0;
+            }
+            else if (ret == Z_STREAM_END)
+                inflateReset(strm);
         }
-        if (ret == Z_STREAM_END)
-            inflateReset(strm);
+        else
+            break;
     } while (strm->avail_out);
     return len - strm->avail_out;
 }