diff options
| author | Yang Tse <yangsita@gmail.com> | 2010-06-09 01:57:37 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2010-06-09 01:57:37 +0200 |
| commit | d3714b016d9f88420d17861d4a48f39365bdd961 (patch) | |
| tree | 881be42ed3e76c2cccee166ccc4db4f6420e273a | |
| parent | da6e992e1dbc2c44c19716ee1ef1f07e4250fd72 (diff) | |
| parent | bb60fe0c1af619ff1507424fa2b27dc458a7215b (diff) | |
| download | gnurl-d3714b016d9f88420d17861d4a48f39365bdd961.tar.gz gnurl-d3714b016d9f88420d17861d4a48f39365bdd961.tar.bz2 gnurl-d3714b016d9f88420d17861d4a48f39365bdd961.zip | |
Merge branch 'master' of git@github.com:bagder/curl
| -rw-r--r-- | lib/inet_pton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inet_pton.c b/lib/inet_pton.c index 9189ce675..db4f39307 100644 --- 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); |