diff options
author | naddy <> | 2024-04-15 14:30:48 +0000 |
---|---|---|
committer | naddy <> | 2024-04-15 14:30:48 +0000 |
commit | f7646eb021595fb6f85c38b99e043277fa2436bc (patch) | |
tree | 161adc5a1fbde78ccfb6b293bd0da5239b8b5045 /src/lib/libc/net/ntohs.c | |
parent | 22372f5970deb0d15444f4ce803b5a44934b22e5 (diff) | |
download | openbsd-f7646eb021595fb6f85c38b99e043277fa2436bc.tar.gz openbsd-f7646eb021595fb6f85c38b99e043277fa2436bc.tar.bz2 openbsd-f7646eb021595fb6f85c38b99e043277fa2436bc.zip |
drop htonl(), htons(), ntohl(), ntohs() MD functions from libc
Userland code compiled in a normal fashion picks up the htonl(),
htons(), ntohl(), ntohs() macros implemented by endian.h. The
functions in libc are effectively unused. Keep the MI functions
in case something looks for the symbols in libc or plays games
with #undef, but change them to wrap the implementation from
endian.h.
tweaks suggested by claudio@, ok miod@
Diffstat (limited to 'src/lib/libc/net/ntohs.c')
-rw-r--r-- | src/lib/libc/net/ntohs.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/libc/net/ntohs.c b/src/lib/libc/net/ntohs.c index b5ea361f83..ef22ea3068 100644 --- a/src/lib/libc/net/ntohs.c +++ b/src/lib/libc/net/ntohs.c | |||
@@ -1,6 +1,5 @@ | |||
1 | /* $OpenBSD: ntohs.c,v 1.9 2014/07/21 01:51:10 guenther Exp $ */ | 1 | /* $OpenBSD: ntohs.c,v 1.10 2024/04/15 14:30:48 naddy Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by J.T. Conklin <jtc@netbsd.org>. | ||
4 | * Public domain. | 3 | * Public domain. |
5 | */ | 4 | */ |
6 | 5 | ||
@@ -9,13 +8,8 @@ | |||
9 | 8 | ||
10 | #undef ntohs | 9 | #undef ntohs |
11 | 10 | ||
12 | u_int16_t | 11 | uint16_t |
13 | ntohs(u_int16_t x) | 12 | ntohs(uint16_t x) |
14 | { | 13 | { |
15 | #if BYTE_ORDER == LITTLE_ENDIAN | 14 | return be16toh(x); |
16 | u_char *s = (u_char *) &x; | ||
17 | return (u_int16_t)(s[0] << 8 | s[1]); | ||
18 | #else | ||
19 | return x; | ||
20 | #endif | ||
21 | } | 15 | } |