diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-04-30 23:49:15 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-04-30 23:49:15 +0000 |
| commit | ebf294559e47717872fb7cc31764bcfba2d0e840 (patch) | |
| tree | 682c96238ff306c84d49c11d768e8071f8121640 /evutil.c | |
| parent | 7f9678079fdef0a1373b91dc4c8a7df62763f673 (diff) | |
| download | libevent-ebf294559e47717872fb7cc31764bcfba2d0e840.tar.gz | |
Compilation fixes for vc++ 2008 express. Not the end of them.
svn:r1260
Diffstat (limited to 'evutil.c')
| -rw-r--r-- | evutil.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -388,7 +388,7 @@ evutil_inet_ntop(int af, const void *src, char *dst, size_t len) (int)(ev_uint8_t)((a>>16)&0xff), (int)(ev_uint8_t)((a>>8 )&0xff), (int)(ev_uint8_t)((a )&0xff)); - if (r<0||r>=len) + if (r<0||(size_t)r>=len) return NULL; else return dst; @@ -490,7 +490,7 @@ evutil_inet_pton(int af, const char *src, void *dst) #ifdef AF_INET6 } else if (af == AF_INET6) { struct in6_addr *out = dst; - uint16_t words[8]; + ev_uint16_t words[8]; int gapPos = -1, i, setWords=0; const char *dot = strchr(src, '.'); const char *eow; /* end of words. */ @@ -536,7 +536,7 @@ evutil_inet_pton(int af, const char *src, void *dst) if (r<0 || r>65536) return 0; - words[i++] = (uint16_t)r; + words[i++] = (ev_uint16_t)r; setWords++; src = next; if (*src != ':' && src != eow) @@ -565,8 +565,8 @@ evutil_inet_pton(int af, const char *src, void *dst) if (nToMove < 0) return -1; /* should be impossible */ memmove(&words[gapPos+gapLen], &words[gapPos], - sizeof(uint16_t)*nToMove); - memset(&words[gapPos], 0, sizeof(uint16_t)*gapLen); + sizeof(ev_uint16_t)*nToMove); + memset(&words[gapPos], 0, sizeof(ev_uint16_t)*gapLen); } for (i = 0; i < 8; ++i) { out->s6_addr[2*i ] = words[i] >> 8; |