summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-09-23 11:16:09 +1000
committerDamien Miller <djm@mindrot.org>2011-09-23 11:16:09 +1000
commit3e6fe87ef99f8ed17d90f0334921183c058697e6 (patch)
tree98abd28715b93c55a17a5f5d13d1b93823550dba /openbsd-compat
parent64efe9671d1b2056e8799dc3a4a2e87925d9804b (diff)
- otto@cvs.openbsd.org 2008/12/09 19:38:38
[openbsd-compat/inet_ntop.c] fix inet_ntop(3) prototype; ok millert@ libc to be bumbed very soon
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/inet_ntop.c8
-rw-r--r--openbsd-compat/openbsd-compat.h4
2 files changed, 6 insertions, 6 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 */
59const char * 59const char *
60inet_ntop(int af, const void *src, char *dst, size_t size) 60inet_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);
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 77c5ed2b1..807acf626 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.51 2010/10/07 10:25:29 djm Exp $ */ 1/* $Id: openbsd-compat.h,v 1.52 2011/09/23 01:16:11 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved. 4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -116,7 +116,7 @@ char *inet_ntoa(struct in_addr in);
116#endif 116#endif
117 117
118#ifndef HAVE_INET_NTOP 118#ifndef HAVE_INET_NTOP
119const char *inet_ntop(int af, const void *src, char *dst, size_t size); 119const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
120#endif 120#endif
121 121
122#ifndef HAVE_INET_ATON 122#ifndef HAVE_INET_ATON