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

This commit is contained in:
Yang Tse 2010-06-09 01:57:37 +02:00
commit d3714b016d
1 changed files with 3 additions and 3 deletions

View File

@ -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);