From 0ce716ae28bcdb9d17311fa9884267ad78c27dc6 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 19 Nov 2012 18:56:42 +0100
Subject: [PATCH] Unbreak buildworld.

Reported-by: marino
---
 contrib/smbfs/lib/smb/mbuf.c    |   24 +++++++++++++++---------
 contrib/smbfs/lib/smb/nb_name.c |    4 ++--
 contrib/smbfs/lib/smb/rap.c     |   10 +++++-----
 contrib/smbfs/smbutil/view.c    |    4 ++--
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/contrib/smbfs/lib/smb/mbuf.c b/contrib/smbfs/lib/smb/mbuf.c
index fa31486..93dd9bf 100644
--- a/contrib/smbfs/lib/smb/mbuf.c
+++ b/contrib/smbfs/lib/smb/mbuf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/mchain.h>
+#include <sys/endian.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -264,7 +264,7 @@ int
 mb_put_int64be(struct mbdata *mbp, int64_t x)
 {
 	MB_PUT(int64_t);
-	*p = htobeq(x);
+	*p = htobe64(x);
 	return 0;
 }
 
@@ -272,7 +272,7 @@ int
 mb_put_int64le(struct mbdata *mbp, int64_t x)
 {
 	MB_PUT(int64_t);
-	*p = htoleq(x);
+	*p = htole64(x);
 	return 0;
 }
 
@@ -363,7 +363,8 @@ mb_get_uint16le(struct mbdata *mbp, u_int16_t *x)
 	u_int16_t v;
 	int error = mb_get_uint16(mbp, &v);
 
-	*x = letohs(v);
+	if (x != NULL)
+		*x = le16toh(v);
 	return error;
 }
 
@@ -372,7 +373,8 @@ mb_get_uint16be(struct mbdata *mbp, u_int16_t *x) {
 	u_int16_t v;
 	int error = mb_get_uint16(mbp, &v);
 
-	*x = betohs(v);
+	if (x != NULL)
+		*x = be16toh(v);
 	return error;
 }
 
@@ -389,7 +391,8 @@ mb_get_uint32be(struct mbdata *mbp, u_int32_t *x)
 	int error;
 
 	error = mb_get_uint32(mbp, &v);
-	*x = betohl(v);
+	if (x != NULL)
+		*x = be32toh(v);
 	return error;
 }
 
@@ -400,7 +403,8 @@ mb_get_uint32le(struct mbdata *mbp, u_int32_t *x)
 	int error;
 
 	error = mb_get_uint32(mbp, &v);
-	*x = letohl(v);
+	if (x != NULL)
+		*x = le32toh(v);
 	return error;
 }
 
@@ -417,7 +421,8 @@ mb_get_int64be(struct mbdata *mbp, int64_t *x)
 	int error;
 
 	error = mb_get_int64(mbp, &v);
-	*x = betohq(v);
+	if (x != NULL)
+		*x = be64toh(v);
 	return error;
 }
 
@@ -428,7 +433,8 @@ mb_get_int64le(struct mbdata *mbp, int64_t *x)
 	int error;
 
 	error = mb_get_int64(mbp, &v);
-	*x = letohq(v);
+	if (x != NULL)
+		*x = le64toh(v);
 	return error;
 }
 
diff --git a/contrib/smbfs/lib/smb/nb_name.c b/contrib/smbfs/lib/smb/nb_name.c
index 01500c3..d44fcb9 100644
--- a/contrib/smbfs/lib/smb/nb_name.c
+++ b/contrib/smbfs/lib/smb/nb_name.c
@@ -33,7 +33,7 @@
  */
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/mchain.h>		/* for endiand macros */
+#include <sys/endian.h>
 
 #include <ctype.h>
 #include <err.h>
@@ -139,7 +139,7 @@ nb_encname_len(const char *str)
 	return len;
 }
 
-#define	NBENCODE(c)	(htoles((u_short)(((u_char)(c) >> 4) | \
+#define	NBENCODE(c)	(htole16((u_short)(((u_char)(c) >> 4) | \
 			 (((u_char)(c) & 0xf) << 8)) + 0x4141))
 
 static void
diff --git a/contrib/smbfs/lib/smb/rap.c b/contrib/smbfs/lib/smb/rap.c
index eb4671c..4529d26 100644
--- a/contrib/smbfs/lib/smb/rap.c
+++ b/contrib/smbfs/lib/smb/rap.c
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <sysexits.h>
 
-#include <sys/mchain.h>
+#include <sys/endian.h>
 
 #include <netsmb/smb_lib.h>
 #include <netsmb/smb_conn.h>
@@ -290,7 +290,7 @@ smb_rap_getNparam(struct smb_rap *rap, long *value)
 		return error;
 	switch (ptype) {
 	    case 'h':
-		*value = letohs(*(u_int16_t*)rap->r_npbuf);
+		*value = le16toh(*(u_int16_t*)rap->r_npbuf);
 		break;
 	    default:
 		return EINVAL;
@@ -320,8 +320,8 @@ smb_rap_request(struct smb_rap *rap, struct smb_ctx *ctx)
 	if (error)
 		return error;
 	rp = (u_int16_t*)rap->r_pbuf;
-	rap->r_result = letohs(*rp++);
-	conv = letohs(*rp++);
+	rap->r_result = le16toh(*rp++);
+	conv = le16toh(*rp++);
 	rap->r_npbuf = (char*)rp;
 	rap->r_entries = entries = 0;
 	done = 0;
@@ -329,7 +329,7 @@ smb_rap_request(struct smb_rap *rap, struct smb_ctx *ctx)
 		ptype = *p;
 		switch (ptype) {
 		    case 'e':
-			rap->r_entries = entries = letohs(*(u_int16_t*)rap->r_npbuf);
+			rap->r_entries = entries = le16toh(*(u_int16_t*)rap->r_npbuf);
 			rap->r_npbuf += 2;
 			p++;
 			break;
diff --git a/contrib/smbfs/smbutil/view.c b/contrib/smbfs/smbutil/view.c
index 42450df..c8f55f0 100644
--- a/contrib/smbfs/smbutil/view.c
+++ b/contrib/smbfs/smbutil/view.c
@@ -44,7 +44,7 @@
 
 #include <cflib.h>
 
-#include <sys/mchain.h>
+#include <sys/endian.h>
 
 #include <netsmb/smb_lib.h>
 #include <netsmb/smb_conn.h>
@@ -113,7 +113,7 @@ cmd_view(int argc, char *argv[])
 		exit(1);
 	}
 	for (ep = rpbuf, i = 0; i < entries; i++, ep++) {
-		type = letohs(ep->shi1_type);
+		type = le16toh(ep->shi1_type);
 
 		cp = (char*)rpbuf + ep->shi1_remark;
 		printf("%-12s %-10s %s\n", ep->shi1_netname,
-- 
1.7.7.2