Remove the hto(be|le)[slq] and (be|le)toh[slq] macros defined in

_KERNEL scope from "src/sys/sys/mchain.h".

Replace each occurrence of the above in _KERNEL scope with the
appropriate macro from the set of hto(be|le)(16|32|64) and
(be|le)toh(16|32|64) from "src/sys/sys/endian.h".

Tested by:		tjr
Requested by:		comment marked with XXX

1 files changed, 12 insertions, 13 deletions

diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index b63a12e..b0aef5c 100644
--- a/sys/kern/subr_mchain.c
+++ b/sys/kern/subr_mchain.c
@@ -32,7 +32,6 @@
  * $FreeBSD$
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
@@ -140,42 +139,42 @@ mb_put_uint8(struct mbchain *mbp, u_int8_t x)
 int
 mb_put_uint16be(struct mbchain *mbp, u_int16_t x)
 {
-	x = htobes(x);
+	x = htobe16(x);
 	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint16le(struct mbchain *mbp, u_int16_t x)
 {
-	x = htoles(x);
+	x = htole16(x);
 	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint32be(struct mbchain *mbp, u_int32_t x)
 {
-	x = htobel(x);
+	x = htobe32(x);
 	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint32le(struct mbchain *mbp, u_int32_t x)
 {
-	x = htolel(x);
+	x = htole32(x);
 	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_int64be(struct mbchain *mbp, int64_t x)
 {
-	x = htobeq(x);
+	x = htobe64(x);
 	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_int64le(struct mbchain *mbp, int64_t x)
 {
-	x = htoleq(x);
+	x = htole64(x);
 	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
 }
 
@@ -377,7 +376,7 @@ md_get_uint16le(struct mdchain *mdp, u_int16_t *x)
 	int error = md_get_uint16(mdp, &v);
 
 	if (x != NULL)
-		*x = letohs(v);
+		*x = le16toh(v);
 	return error;
 }
 
@@ -387,7 +386,7 @@ md_get_uint16be(struct mdchain *mdp, u_int16_t *x) {
 	int error = md_get_uint16(mdp, &v);
 
 	if (x != NULL)
-		*x = betohs(v);
+		*x = be16toh(v);
 	return error;
 }
 
@@ -405,7 +404,7 @@ md_get_uint32be(struct mdchain *mdp, u_int32_t *x)
 
 	error = md_get_uint32(mdp, &v);
 	if (x != NULL)
-		*x = betohl(v);
+		*x = be32toh(v);
 	return error;
 }
 
@@ -417,7 +416,7 @@ md_get_uint32le(struct mdchain *mdp, u_int32_t *x)
 
 	error = md_get_uint32(mdp, &v);
 	if (x != NULL)
-		*x = letohl(v);
+		*x = le32toh(v);
 	return error;
 }
 
@@ -435,7 +434,7 @@ md_get_int64be(struct mdchain *mdp, int64_t *x)
 
 	error = md_get_int64(mdp, &v);
 	if (x != NULL)
-		*x = betohq(v);
+		*x = be64toh(v);
 	return error;
 }
 
@@ -447,7 +446,7 @@ md_get_int64le(struct mdchain *mdp, int64_t *x)
 
 	error = md_get_int64(mdp, &v);
 	if (x != NULL)
-		*x = letohq(v);
+		*x = le64toh(v);
 	return error;
 }