diff options
author | mike <mike@FreeBSD.org> | 2002-02-18 20:35:27 +0000 |
---|---|---|
committer | mike <mike@FreeBSD.org> | 2002-02-18 20:35:27 +0000 |
commit | bcee06d42c20a8ea0e6c6ffb8924e16e7e793c0f (patch) | |
tree | 970c36894ee638248ec810bd7570ac8aabb5eaf5 /lib/libstand | |
parent | f2e166dc7a7880a8564c2a7cb8ca2b94566d8d6b (diff) | |
download | FreeBSD-src-bcee06d42c20a8ea0e6c6ffb8924e16e7e793c0f.zip FreeBSD-src-bcee06d42c20a8ea0e6c6ffb8924e16e7e793c0f.tar.gz |
o Move NTOHL() and associated macros into <sys/param.h>. These are
deprecated in favor of the POSIX-defined lowercase variants.
o Change all occurrences of NTOHL() and associated marcros in the
source tree to use the lowercase function variants.
o Add missing license bits to sparc64's <machine/endian.h>.
Approved by: jake
o Clean up <machine/endian.h> files.
o Remove unused __uint16_swap_uint32() from i386's <machine/endian.h>.
o Remove prototypes for non-existent bswapXX() functions.
o Include <machine/endian.h> in <arpa/inet.h> to define the
POSIX-required ntohl() family of functions.
o Do similar things to expose the ntohl() family in libstand, <netinet/in.h>,
and <sys/param.h>.
o Prepend underscores to the ntohl() family to help deal with
complexities associated with having MD (asm and inline) versions, and
having to prevent exposure of these functions in other headers that
happen to make use of endian-specific defines.
o Create weak aliases to the canonical function name to help deal with
third-party software forgetting to include an appropriate header.
o Remove some now unneeded pollution from <sys/types.h>.
o Add missing <arpa/inet.h> includes in userland.
Tested on: alpha, i386
Reviewed by: bde, jake, tmm
Diffstat (limited to 'lib/libstand')
-rw-r--r-- | lib/libstand/net.c | 2 | ||||
-rw-r--r-- | lib/libstand/stand.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/libstand/net.c b/lib/libstand/net.c index 6ac0de8..06d9dbf 100644 --- a/lib/libstand/net.c +++ b/lib/libstand/net.c @@ -231,7 +231,7 @@ intoa(addr) register int n; static char buf[17]; /* strlen(".255.255.255.255") + 1 */ - NTOHL(addr); + addr = ntohl(addr); cp = &buf[sizeof buf]; *--cp = '\0'; diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h index b9e31ad..e3570f9 100644 --- a/lib/libstand/stand.h +++ b/lib/libstand/stand.h @@ -371,6 +371,19 @@ extern void panic(const char *, ...) __dead2; extern struct fs_ops *file_system[]; extern struct devsw *devsw[]; +/* + * Expose byteorder(3) functions. + */ +#define htonl(x) __htonl(x) +#define htons(x) __htons(x) +#define ntohl(x) __ntohl(x) +#define ntohs(x) __ntohs(x) + +extern uint32_t htonl(uint32_t); +extern uint16_t htons(uint16_t); +extern uint32_t ntohl(uint32_t); +extern uint16_t ntohs(uint16_t); + #if 0 static inline void * |