diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
commit | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch) | |
tree | c59b4dbcc610f10700945f885adf3bddc2542c26 /openbsd-compat/inet_ntop.c | |
parent | 8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff) | |
parent | b9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff) |
merge 6.0p1
Diffstat (limited to 'openbsd-compat/inet_ntop.c')
-rw-r--r-- | openbsd-compat/inet_ntop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c index e7ca4b7f8..3259037ba 100644 --- a/openbsd-compat/inet_ntop.c +++ b/openbsd-compat/inet_ntop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: inet_ntop.c,v 1.7 2005/08/06 20:30:03 espie Exp $ */ | 1 | /* $OpenBSD: inet_ntop.c,v 1.8 2008/12/09 19:38:38 otto Exp $ */ |
2 | 2 | ||
3 | /* Copyright (c) 1996 by Internet Software Consortium. | 3 | /* Copyright (c) 1996 by Internet Software Consortium. |
4 | * | 4 | * |
@@ -57,13 +57,13 @@ static const char *inet_ntop6(const u_char *src, char *dst, size_t size); | |||
57 | * Paul Vixie, 1996. | 57 | * Paul Vixie, 1996. |
58 | */ | 58 | */ |
59 | const char * | 59 | const char * |
60 | inet_ntop(int af, const void *src, char *dst, size_t size) | 60 | inet_ntop(int af, const void *src, char *dst, socklen_t size) |
61 | { | 61 | { |
62 | switch (af) { | 62 | switch (af) { |
63 | case AF_INET: | 63 | case AF_INET: |
64 | return (inet_ntop4(src, dst, size)); | 64 | return (inet_ntop4(src, dst, (size_t)size)); |
65 | case AF_INET6: | 65 | case AF_INET6: |
66 | return (inet_ntop6(src, dst, size)); | 66 | return (inet_ntop6(src, dst, (size_t)size)); |
67 | default: | 67 | default: |
68 | errno = EAFNOSUPPORT; | 68 | errno = EAFNOSUPPORT; |
69 | return (NULL); | 69 | return (NULL); |