From: Dan Fandrich <dan@coneharvesters.com>
Date: Mon, 23 Mar 2015 09:16:10 +0000 (+0100)
Subject: dict: rename byte to avoid compiler shadowed declaration warning
X-Git-Tag: curl-7_42_0~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=145c4692ffb58ea4492a7912f636b3b834c84dd7;p=curl

dict: rename byte to avoid compiler shadowed declaration warning

This conflicted with a WolfSSL typedef.
---

diff --git a/lib/dict.c b/lib/dict.c
index daea68070..06d76992e 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -97,7 +97,7 @@ static char *unescape_word(struct SessionHandle *data, const char *inputbuff)
   char *dictp;
   char *ptr;
   int len;
-  char byte;
+  char ch;
   int olen=0;
 
   newp = curl_easy_unescape(data, inputbuff, 0, &len);
@@ -109,13 +109,13 @@ static char *unescape_word(struct SessionHandle *data, const char *inputbuff)
     /* According to RFC2229 section 2.2, these letters need to be escaped with
        \[letter] */
     for(ptr = newp;
-        (byte = *ptr) != 0;
+        (ch = *ptr) != 0;
         ptr++) {
-      if((byte <= 32) || (byte == 127) ||
-          (byte == '\'') || (byte == '\"') || (byte == '\\')) {
+      if((ch <= 32) || (ch == 127) ||
+          (ch == '\'') || (ch == '\"') || (ch == '\\')) {
         dictp[olen++] = '\\';
       }
-      dictp[olen++] = byte;
+      dictp[olen++] = ch;
     }
     dictp[olen]=0;
   }