From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 11 Apr 2010 12:01:58 +0000 (+1200)
Subject: Bug 2899: Restore lost rfc1738_unescape() data type
X-Git-Tag: SQUID_3_1_2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55bfea35706dff15171de7086566d64f984e9a52;p=thirdparty%2Fsquid.git

Bug 2899: Restore lost rfc1738_unescape() data type

Data type was converted to char from int during recent upgrades.
On unix systems char is unsigned making the safety checks fail on build.
This reverts the type back to a usable signed int, no logic changes.
---

diff --git a/lib/rfc1738.c b/lib/rfc1738.c
index 6158375686..70289b4545 100644
--- a/lib/rfc1738.c
+++ b/lib/rfc1738.c
@@ -174,8 +174,7 @@ rfc1738_unescape(char *s)
             j++;		/* Skip % */
         } else {
             /* decode */
-            char v1, v2;
-            int x;
+            int v1, v2, x;
             v1 = fromhex(s[j + 1]);
             if (v1 < 0)
                 continue;  /* non-hex or \0 */