optimize ntohl etc. in terms of bswap functions

we can do this without violating the namespace now that they are
macros/inline functions rather than extern functions. the motivation
is that gcc was generating giant, slow, horrible code for the old
functions, and now generates a single byte-swapping instruction.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/network/htons.c b/src/network/htons.c
index 522504a5..03a3a1d5 100644
--- a/src/network/htons.c
+++ b/src/network/htons.c
@@ -1,10 +1,8 @@
 #include <netinet/in.h>
+#include <byteswap.h>
 
 uint16_t htons(uint16_t n)
 {
-	union {
-		uint8_t b[2];
-		uint16_t s;
-	} u = { { n>>8, n } };
-	return u.s;
+	union { int i; char c; } u = { 1 };
+	return u.c ? bswap_16(n) : n;
 }