diff options
Diffstat (limited to 'src/lib/libc/net/htonl.c')
-rw-r--r-- | src/lib/libc/net/htonl.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/lib/libc/net/htonl.c b/src/lib/libc/net/htonl.c index ac85cb0fd7..73b7432731 100644 --- a/src/lib/libc/net/htonl.c +++ b/src/lib/libc/net/htonl.c | |||
@@ -1,29 +1,25 @@ | |||
1 | /* $NetBSD: htonl.c,v 1.5 1995/04/28 23:25:14 jtc Exp $ */ | ||
2 | |||
3 | /* | 1 | /* |
4 | * Written by J.T. Conklin <jtc@netbsd.org>. | 2 | * Written by J.T. Conklin <jtc@netbsd.org>. |
5 | * Public domain. | 3 | * Public domain. |
6 | */ | 4 | */ |
7 | 5 | ||
8 | #if defined(LIBC_SCCS) && !defined(lint) | 6 | #if defined(LIBC_SCCS) && !defined(lint) |
9 | static char *rcsid = "$NetBSD: htonl.c,v 1.5 1995/04/28 23:25:14 jtc Exp $"; | 7 | static char *rcsid = "$OpenBSD: htonl.c,v 1.4 1996/12/12 03:19:55 tholo Exp $"; |
10 | #endif | 8 | #endif /* LIBC_SCCS and not lint */ |
11 | 9 | ||
12 | #include <sys/types.h> | 10 | #include <sys/types.h> |
13 | #include <machine/endian.h> | 11 | #include <machine/endian.h> |
14 | 12 | ||
15 | #undef htonl | 13 | #undef htonl |
16 | 14 | ||
17 | unsigned long | 15 | u_int32_t |
18 | htonl(x) | 16 | htonl(x) |
19 | unsigned long x; | 17 | u_int32_t x; |
20 | { | 18 | { |
21 | u_int32_t y = x; | ||
22 | |||
23 | #if BYTE_ORDER == LITTLE_ENDIAN | 19 | #if BYTE_ORDER == LITTLE_ENDIAN |
24 | u_char *s = (u_char *)&y; | 20 | u_char *s = (u_char *)&x; |
25 | return s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]; | 21 | return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]); |
26 | #else | 22 | #else |
27 | return y; | 23 | return x; |
28 | #endif | 24 | #endif |
29 | } | 25 | } |