From: Yang Tse <yangsita@gmail.com>
Date: Mon, 22 Feb 2010 02:37:13 +0000 (+0000)
Subject: fix compiler warning
X-Git-Tag: curl-7_20_1~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9f0a9758536d1bd7bfa2f9b073d6a63570f721;p=thirdparty%2Fcurl.git

fix compiler warning
---

diff --git a/lib/base64.c b/lib/base64.c
index dea74de9e2..1820302a11 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -70,11 +70,11 @@ static void decodeQuantum(unsigned char *dest, const char *src)
       x = (x << 6);
   }
 
-  dest[2] = (unsigned char)(x & 0xFFUL);
+  dest[2] = Curl_ultouc(x);
   x >>= 8;
-  dest[1] = (unsigned char)(x & 0xFFUL);
+  dest[1] = Curl_ultouc(x);
   x >>= 8;
-  dest[0] = (unsigned char)(x & 0xFFUL);
+  dest[0] = Curl_ultouc(x);
 }
 
 /*
diff --git a/lib/warnless.c b/lib/warnless.c
index 83a1c68ab2..94e77de46d 100644
--- a/lib/warnless.c
+++ b/lib/warnless.c
@@ -38,3 +38,17 @@ unsigned short Curl_ultous(unsigned long ulnum)
 #  pragma warning(pop)
 #endif
 }
+
+unsigned char Curl_ultouc(unsigned long ulnum)
+{
+#ifdef __INTEL_COMPILER
+#  pragma warning(push)
+#  pragma warning(disable:810) /* conversion may lose significant bits */
+#endif
+
+  return (unsigned char)(ulnum & 0xFFUL);
+
+#ifdef __INTEL_COMPILER
+#  pragma warning(pop)
+#endif
+}
diff --git a/lib/warnless.h b/lib/warnless.h
index cd257d3ed7..d8734910ad 100644
--- a/lib/warnless.h
+++ b/lib/warnless.h
@@ -25,4 +25,6 @@
 
 unsigned short Curl_ultous(unsigned long ulnum);
 
+unsigned char Curl_ultouc(unsigned long ulnum);
+
 #endif /* HEADER_CURL_WARNLESS_H */