diff options
Diffstat (limited to 'src/lib/libc/net/inet_ntoa.c')
-rw-r--r-- | src/lib/libc/net/inet_ntoa.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/lib/libc/net/inet_ntoa.c b/src/lib/libc/net/inet_ntoa.c index 2da0ab00ff..ff5d93ded2 100644 --- a/src/lib/libc/net/inet_ntoa.c +++ b/src/lib/libc/net/inet_ntoa.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* $NetBSD: inet_ntoa.c,v 1.4 1995/02/25 06:20:46 cgd Exp $ */ | 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. |
@@ -12,11 +11,7 @@ | |||
12 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. |
15 | * 3. All advertising materials mentioning features or use of this software | 14 | * 3. Neither the name of the University nor the names of its contributors |
16 | * must display the following acknowledgement: | ||
17 | * This product includes software developed by the University of | ||
18 | * California, Berkeley and its contributors. | ||
19 | * 4. Neither the name of the University nor the names of its contributors | ||
20 | * may be used to endorse or promote products derived from this software | 15 | * may be used to endorse or promote products derived from this software |
21 | * without specific prior written permission. | 16 | * without specific prior written permission. |
22 | * | 17 | * |
@@ -33,14 +28,6 @@ | |||
33 | * SUCH DAMAGE. | 28 | * SUCH DAMAGE. |
34 | */ | 29 | */ |
35 | 30 | ||
36 | #if defined(LIBC_SCCS) && !defined(lint) | ||
37 | #if 0 | ||
38 | static char sccsid[] = "@(#)inet_ntoa.c 8.1 (Berkeley) 6/4/93"; | ||
39 | #else | ||
40 | static char rcsid[] = "$NetBSD: inet_ntoa.c,v 1.4 1995/02/25 06:20:46 cgd Exp $"; | ||
41 | #endif | ||
42 | #endif /* LIBC_SCCS and not lint */ | ||
43 | |||
44 | /* | 31 | /* |
45 | * Convert network-format internet address | 32 | * Convert network-format internet address |
46 | * to base 256 d.d.d.d representation. | 33 | * to base 256 d.d.d.d representation. |
@@ -51,15 +38,14 @@ static char rcsid[] = "$NetBSD: inet_ntoa.c,v 1.4 1995/02/25 06:20:46 cgd Exp $" | |||
51 | #include <stdio.h> | 38 | #include <stdio.h> |
52 | 39 | ||
53 | char * | 40 | char * |
54 | inet_ntoa(in) | 41 | inet_ntoa(struct in_addr in) |
55 | struct in_addr in; | ||
56 | { | 42 | { |
57 | static char b[18]; | 43 | static char b[18]; |
58 | register char *p; | 44 | char *p; |
59 | 45 | ||
60 | p = (char *)∈ | 46 | p = (char *)∈ |
61 | #define UC(b) (((int)b)&0xff) | 47 | #define UC(b) (((int)b)&0xff) |
62 | (void)snprintf(b, sizeof(b), | 48 | (void)snprintf(b, sizeof(b), |
63 | "%d.%d.%d.%d", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3])); | 49 | "%u.%u.%u.%u", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3])); |
64 | return (b); | 50 | return (b); |
65 | } | 51 | } |