diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | openbsd-compat/inet_ntoa.c | 10 |
2 files changed, 6 insertions, 7 deletions
@@ -33,6 +33,7 @@ | |||
33 | - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up | 33 | - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up |
34 | with OpenBSD code since we don't support platforms without fstat any more. | 34 | with OpenBSD code since we don't support platforms without fstat any more. |
35 | - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9. | 35 | - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9. |
36 | - (dtucker) [openbsd-compat/inet_nto.c] Update from OpenBSD 1.4 -> 1.6. | ||
36 | 37 | ||
37 | 20051105 | 38 | 20051105 |
38 | - (djm) OpenBSD CVS Sync | 39 | - (djm) OpenBSD CVS Sync |
@@ -3275,4 +3276,4 @@ | |||
3275 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3276 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3276 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3277 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3277 | 3278 | ||
3278 | $Id: ChangeLog,v 1.3975 2005/11/10 06:21:21 dtucker Exp $ | 3279 | $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 @@ | |||
1 | /* $OpenBSD: inet_ntoa.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 1983, 1993 | 3 | * Copyright (c) 1983, 1993 |
3 | * The Regents of the University of California. All rights reserved. | 4 | * The Regents of the University of California. All rights reserved. |
@@ -33,10 +34,6 @@ | |||
33 | 34 | ||
34 | #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) | 35 | #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) |
35 | 36 | ||
36 | #if defined(LIBC_SCCS) && !defined(lint) | ||
37 | static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert Exp $"; | ||
38 | #endif /* LIBC_SCCS and not lint */ | ||
39 | |||
40 | /* | 37 | /* |
41 | * Convert network-format internet address | 38 | * Convert network-format internet address |
42 | * to base 256 d.d.d.d representation. | 39 | * 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 | |||
46 | #include <arpa/inet.h> | 43 | #include <arpa/inet.h> |
47 | #include <stdio.h> | 44 | #include <stdio.h> |
48 | 45 | ||
49 | char *inet_ntoa(struct in_addr in) | 46 | char * |
47 | inet_ntoa(struct in_addr in) | ||
50 | { | 48 | { |
51 | static char b[18]; | 49 | static char b[18]; |
52 | register char *p; | 50 | char *p; |
53 | 51 | ||
54 | p = (char *)∈ | 52 | p = (char *)∈ |
55 | #define UC(b) (((int)b)&0xff) | 53 | #define UC(b) (((int)b)&0xff) |