Merge branch 'master' of git@github.com:bagder/curl

curl · Jun 8, 2010 · d3714b0 · d3714b0
2 parents da6e992 + bb60fe0
commit d3714b0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/inet_pton.c b/lib/inet_pton.c
@@ -159,7 +159,7 @@ inet_pton6(const char *src, unsigned char *dst)
   unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
   const char *xdigits, *curtok;
   int ch, saw_xdigit;
-  unsigned int val;
+  size_t val;
 
   memset((tp = tmp), 0, IN6ADDRSZ);
   endp = tp + IN6ADDRSZ;
@@ -218,8 +218,8 @@ inet_pton6(const char *src, unsigned char *dst)
      * Since some memmove()'s erroneously fail to handle
      * overlapping regions, we'll do the shift by hand.
      */
-    const long n = tp - colonp;
-    long i;
+    const size_t n = tp - colonp;
+    size_t i;
 
     if(tp == endp)
       return (0);