From: Mark Adler <zlib@madler.net>
Date: Fri, 13 Oct 2017 03:03:51 +0000 (-0700)
Subject: Make the names in functions declarations identical to definitions.
X-Git-Tag: 1.9.9-b1~583
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9f5d668f692f894e89256ec3696c55c131510ed;p=thirdparty%2Fzlib-ng.git

Make the names in functions declarations identical to definitions.
---

diff --git a/gzwrite.c b/gzwrite.c
index 8395b65e..b8c643c0 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -319,7 +319,7 @@ int ZEXPORT PREFIX(gzputc)(gzFile file, int c) {
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT PREFIX(gzputs)(gzFile file, const char *str) {
+int ZEXPORT PREFIX(gzputs)(gzFile file, const char *s) {
     int ret;
     size_t len;
     gz_state *state;
@@ -334,8 +334,8 @@ int ZEXPORT PREFIX(gzputs)(gzFile file, const char *str) {
         return -1;
 
     /* write string */
-    len = strlen(str);
-    ret = (int)gz_write(state, str, len);
+    len = strlen(s);
+    ret = (int)gz_write(state, s, len);
     return ret == 0 && len != 0 ? -1 : ret;
 }
 
diff --git a/trees.c b/trees.c
index 13041091..de4ca249 100644
--- a/trees.c
+++ b/trees.c
@@ -145,7 +145,7 @@ static int  build_bl_tree    (deflate_state *s);
 static void send_all_trees   (deflate_state *s, int lcodes, int dcodes, int blcodes);
 static void compress_block   (deflate_state *s, const ct_data *ltree, const ct_data *dtree);
 static int  detect_data_type (deflate_state *s);
-static unsigned bi_reverse   (unsigned value, int length);
+static unsigned bi_reverse   (unsigned code, int len);
 static void bi_flush         (deflate_state *s);
 
 #ifdef GEN_TREES_H