From: Pavel Charvat <pchar@ucw.cz>
Date: Wed, 28 Jan 2009 01:32:02 +0000 (+0100)
Subject: URLs: Fixed some broken comparisons of possibly signed chars.
X-Git-Tag: holmes-import~118^2~4
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=87a9493b2353f1ba7a0ea1bac3d8b7dbe3172d27;p=libucw.git

URLs: Fixed some broken comparisons of possibly signed chars.

(It was causing failures in Shepherd.)
---

diff --git a/ucw/url.c b/ucw/url.c
index 4b0ddeaa..39e52946 100644
--- a/ucw/url.c
+++ b/ucw/url.c
@@ -150,7 +150,7 @@ url_enescape(const char *s, char *d)
 	*d++ = *s++;
       else
 	{
-	  uns val = ((byte)*s < NCC_MAX) ? NCC_CHARS[(byte)*s] : *s;
+	  uns val = (byte)(((byte)*s < NCC_MAX) ? NCC_CHARS[(byte)*s] : *s);
 	  *d++ = '%';
 	  *d++ = enhex(val >> 4);
 	  *d++ = enhex(val & 0x0f);
@@ -170,14 +170,14 @@ url_enescape_friendly(const char *src, char *dest)
     {
       if (dest >= end)
 	return URL_ERR_TOO_LONG;
-      if (*srcb < NCC_MAX)
+      if ((byte)*srcb < NCC_MAX)
 	*dest++ = NCC_CHARS[*srcb++];
       else if (*srcb >= 0x20 && *srcb < 0x7f)
 	*dest++ = *srcb++;
       else
 	{
 	  *dest++ = '%';
-	  *dest++ = enhex(*srcb >> 4);
+	  *dest++ = enhex((byte)*srcb >> 4);
 	  *dest++ = enhex(*srcb++ & 0x0f);
 	}
     }