diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
tree | f64a4ace625514e94759878c0b94ab0a79805bbd /openbsd-compat/inet_ntoa.c | |
parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'openbsd-compat/inet_ntoa.c')
-rw-r--r-- | openbsd-compat/inet_ntoa.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index dc010dc53..0eb7b3bd7 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */ | 1 | /* $OpenBSD: inet_ntoa.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ |
2 | |||
3 | /* | 2 | /* |
4 | * Copyright (c) 1983, 1993 | 3 | * Copyright (c) 1983, 1993 |
5 | * The Regents of the University of California. All rights reserved. | 4 | * The Regents of the University of California. All rights reserved. |
@@ -29,14 +28,12 @@ | |||
29 | * SUCH DAMAGE. | 28 | * SUCH DAMAGE. |
30 | */ | 29 | */ |
31 | 30 | ||
31 | /* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */ | ||
32 | |||
32 | #include "includes.h" | 33 | #include "includes.h" |
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) |