diff options
| author | Damien Miller <djm@mindrot.org> | 2011-09-23 11:16:09 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-09-23 11:16:09 +1000 |
| commit | 3e6fe87ef99f8ed17d90f0334921183c058697e6 (patch) | |
| tree | 98abd28715b93c55a17a5f5d13d1b93823550dba | |
| parent | 64efe9671d1b2056e8799dc3a4a2e87925d9804b (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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | openbsd-compat/inet_ntop.c | 8 | ||||
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 4 |
3 files changed, 12 insertions, 9 deletions
@@ -15,17 +15,20 @@ Convert do {} while loop -> while {} for clarity. No binary change on most architectures. From Oliver Smith. OK deraadt@ and henning@ - tobias@cvs.openbsd.org 2007/10/21 11:09:30 - [mktemp.c] + [openbsd-compat/mktemp.c] Comment fix about time consumption of _gettemp. FreeBSD did this in revision 1.20. OK deraadt@, krw@ - deraadt@cvs.openbsd.org 2008/07/22 21:47:45 - [mktemp.c] + [openbsd-compat/mktemp.c] use arc4random_uniform(); ok djm millert - millert@cvs.openbsd.org 2008/08/21 16:54:44 - [mktemp.c] + [openbsd-compat/mktemp.c] Remove useless code, the kernel will set errno appropriately if an element in the path does not exist. OK deraadt@ pvalchev@ + - 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 20110922 - OpenBSD CVS Sync diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c index e7ca4b7f..3259037b 100644 --- a/openbsd-compat/inet_ntop.c +++ b/openbsd-compat/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. * @@ -57,13 +57,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); diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 77c5ed2b..807acf62 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h @@ -1,4 +1,4 @@ -/* $Id: openbsd-compat.h,v 1.51 2010/10/07 10:25:29 djm Exp $ */ +/* $Id: openbsd-compat.h,v 1.52 2011/09/23 01:16:11 djm Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -116,7 +116,7 @@ char *inet_ntoa(struct in_addr in); #endif #ifndef HAVE_INET_NTOP -const char *inet_ntop(int af, const void *src, char *dst, size_t size); +const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); #endif #ifndef HAVE_INET_ATON |