From de9d623960b6e5562a73600b225d82c2497dfc58 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 10 Nov 2005 17:23:54 +1100 Subject: [PATCH] - (dtucker) [openbsd-compat/inet_nto.c] Update from OpenBSD 1.4 -> 1.6. --- ChangeLog | 3 ++- openbsd-compat/inet_ntoa.c | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 120f68f84..324084562 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up with OpenBSD code since we don't support platforms without fstat any more. - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9. + - (dtucker) [openbsd-compat/inet_nto.c] Update from OpenBSD 1.4 -> 1.6. 20051105 - (djm) OpenBSD CVS Sync @@ -3275,4 +3276,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3975 2005/11/10 06:21:21 dtucker Exp $ +$Id: ChangeLog,v 1.3976 2005/11/10 06:23:54 dtucker Exp $ diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index 16390b178..0eb7b3bd7 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c @@ -1,3 +1,4 @@ +/* $OpenBSD: inet_ntoa.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -33,10 +34,6 @@ #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Convert network-format internet address * to base 256 d.d.d.d representation. @@ -46,10 +43,11 @@ static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert E #include #include -char *inet_ntoa(struct in_addr in) +char * +inet_ntoa(struct in_addr in) { static char b[18]; - register char *p; + char *p; p = (char *)∈ #define UC(b) (((int)b)&0xff)