From d9f3d0f3d6af396a7b74483702c4cd73f07ac08f Mon Sep 17 00:00:00 2001 From: otto <> Date: Tue, 9 Dec 2008 19:38:38 +0000 Subject: fix inet_ntop(3) prototype; ok millert@ libc to be bumbed very soon --- src/lib/libc/net/inet.3 | 6 +++--- src/lib/libc/net/inet_ntop.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/lib/libc/net/inet.3 b/src/lib/libc/net/inet.3 index c650df360b..3f198ae8e0 100644 --- a/src/lib/libc/net/inet.3 +++ b/src/lib/libc/net/inet.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: inet.3,v 1.21 2007/06/12 16:50:06 jmc Exp $ +.\" $OpenBSD: inet.3,v 1.22 2008/12/09 19:38:38 otto Exp $ .\" $NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)inet.3 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd $Mdocdate: December 9 2008 $ .Dt INET 3 .Os .Sh NAME @@ -64,7 +64,7 @@ .Ft char * .Fn inet_ntoa "struct in_addr in" .Ft const char * -.Fn inet_ntop "int af" "const void *src" "char *dst" "size_t size" +.Fn inet_ntop "int af" "const void *src" "char *dst" "socklen_t size" .Ft int .Fn inet_pton "int af" "const char *src" "void *dst" .Sh DESCRIPTION diff --git a/src/lib/libc/net/inet_ntop.c b/src/lib/libc/net/inet_ntop.c index d36a0d7889..9deb352e24 100644 --- a/src/lib/libc/net/inet_ntop.c +++ b/src/lib/libc/net/inet_ntop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_ntop.c,v 1.7 2005/08/06 20:30:03 espie Exp $ */ +/* $OpenBSD: inet_ntop.c,v 1.8 2008/12/09 19:38:38 otto Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -43,13 +43,13 @@ static const char *inet_ntop6(const u_char *src, char *dst, size_t size); * Paul Vixie, 1996. */ const char * -inet_ntop(int af, const void *src, char *dst, size_t size) +inet_ntop(int af, const void *src, char *dst, socklen_t size) { switch (af) { case AF_INET: - return (inet_ntop4(src, dst, size)); + return (inet_ntop4(src, dst, (size_t)size)); case AF_INET6: - return (inet_ntop6(src, dst, size)); + return (inet_ntop6(src, dst, (size_t)size)); default: errno = EAFNOSUPPORT; return (NULL); -- cgit v1.2.3-55-g6feb