[src/trunk]: src/sys/netsmb use explicit width macros from <sys/endian.h>, do...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/463df2fb73dd
branches:  trunk
changeset: 543149:463df2fb73dd
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Feb 18 10:18:52 2003 +0000

description:
use explicit width macros from <sys/endian.h>, do not define&use
letohs/letohl/letohq and such

diffstat:

 sys/netsmb/mchain.h      |  18 ++----------------
 sys/netsmb/smb.h         |   4 ++--
 sys/netsmb/smb_iod.c     |   6 +++---
 sys/netsmb/smb_subr.c    |   4 ++--
 sys/netsmb/subr_mchain.c |  26 +++++++++++++-------------
 5 files changed, 22 insertions(+), 36 deletions(-)

diffs (197 lines):

diff -r 0e2057a5969a -r 463df2fb73dd sys/netsmb/mchain.h
--- a/sys/netsmb/mchain.h       Tue Feb 18 10:16:49 2003 +0000
+++ b/sys/netsmb/mchain.h       Tue Feb 18 10:18:52 2003 +0000
@@ -34,23 +34,9 @@
 #ifndef _SYS_MCHAIN_H_
 #define _SYS_MCHAIN_H_
 
-#include <machine/endian.h>
-
-#define htoles(x)      htole16(x)
-#define letohs(x)      le16toh(x)
-#define        htolel(x)       htole32(x)
-#define        letohl(x)       le32toh(x)
-#define        htoleq(x)       htole64(x)
-#define        letohq(x)       le64toh(x)
+#ifdef _KERNEL
 
-#define htobes(x)      htobe16(x)
-#define betohs(x)      be16toh(x)
-#define htobel(x)      htobe32(x)
-#define betohl(x)      be32toh(x)
-#define htobeq(x)      htobe64(x)
-#define betohq(x)      be64toh(x)
-
-#ifdef _KERNEL
+#include <machine/endian.h>
 
 /*
  * Type of copy for mb_{put|get}_mem()
diff -r 0e2057a5969a -r 463df2fb73dd sys/netsmb/smb.h
--- a/sys/netsmb/smb.h  Tue Feb 18 10:16:49 2003 +0000
+++ b/sys/netsmb/smb.h  Tue Feb 18 10:18:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb.h,v 1.4 2003/02/18 10:09:29 jdolecek Exp $ */
+/*     $NetBSD: smb.h,v 1.5 2003/02/18 10:18:53 jdolecek Exp $ */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -70,7 +70,7 @@
  */
 #define        SMB_SIGNATURE           "\xFFSMB"
 #define        SMB_SIGLEN              4
-#define        SMB_HDRMID(p)           (letohs(*(u_short*)((u_char*)(p) + 30)))
+#define        SMB_HDRMID(p)           (le16toh(*(u_short*)((u_char*)(p) + 30)))
 #define        SMB_HDRLEN              32
 /*
  * bits in the smb_flags field
diff -r 0e2057a5969a -r 463df2fb73dd sys/netsmb/smb_iod.c
--- a/sys/netsmb/smb_iod.c      Tue Feb 18 10:16:49 2003 +0000
+++ b/sys/netsmb/smb_iod.c      Tue Feb 18 10:18:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb_iod.c,v 1.4 2003/02/01 06:23:48 thorpej Exp $      */
+/*     $NetBSD: smb_iod.c,v 1.5 2003/02/18 10:18:53 jdolecek Exp $     */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -234,8 +234,8 @@
                if (vcp->vc_maxmux != 0 && iod->iod_muxcnt >= vcp->vc_maxmux)
                        return 0;
 #endif
-               *rqp->sr_rqtid = htoles(ssp ? ssp->ss_tid : SMB_TID_UNKNOWN);
-               *rqp->sr_rquid = htoles(vcp ? vcp->vc_smbuid : 0);
+               *rqp->sr_rqtid = htole16(ssp ? ssp->ss_tid : SMB_TID_UNKNOWN);
+               *rqp->sr_rquid = htole16(vcp ? vcp->vc_smbuid : 0);
                mb_fixhdr(&rqp->sr_rq);
        }
        if (rqp->sr_sendcnt++ > 5) {
diff -r 0e2057a5969a -r 463df2fb73dd sys/netsmb/smb_subr.c
--- a/sys/netsmb/smb_subr.c     Tue Feb 18 10:16:49 2003 +0000
+++ b/sys/netsmb/smb_subr.c     Tue Feb 18 10:18:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb_subr.c,v 1.6 2003/02/18 10:09:28 jdolecek Exp $    */
+/*     $NetBSD: smb_subr.c,v 1.7 2003/02/18 10:18:53 jdolecek Exp $    */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -189,7 +189,7 @@
 smb_strtouni(u_int16_t *dst, const char *src)
 {
        while (*src) {
-               *dst++ = htoles(*src++);
+               *dst++ = htole16(*src++);
        }
        *dst = 0;
 }
diff -r 0e2057a5969a -r 463df2fb73dd sys/netsmb/subr_mchain.c
--- a/sys/netsmb/subr_mchain.c  Tue Feb 18 10:16:49 2003 +0000
+++ b/sys/netsmb/subr_mchain.c  Tue Feb 18 10:18:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_mchain.c,v 1.2 2002/09/27 15:37:59 provos Exp $   */
+/*     $NetBSD: subr_mchain.c,v 1.3 2003/02/18 10:18:53 jdolecek Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Boris Popov
@@ -216,42 +216,42 @@
 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);
 }
 
@@ -450,7 +450,7 @@
        u_int16_t v;
        int error = md_get_uint16(mdp, &v);
 
-       *x = letohs(v);
+       *x = le16toh(v);
        return error;
 }
 
@@ -459,7 +459,7 @@
        u_int16_t v;
        int error = md_get_uint16(mdp, &v);
 
-       *x = betohs(v);
+       *x = be16toh(v);
        return error;
 }
 
@@ -476,7 +476,7 @@
        int error;
 
        error = md_get_uint32(mdp, &v);
-       *x = betohl(v);
+       *x = be32toh(v);
        return error;
 }
 
@@ -487,7 +487,7 @@
        int error;
 
        error = md_get_uint32(mdp, &v);
-       *x = letohl(v);
+       *x = le32toh(v);
        return error;
 }
 
@@ -504,7 +504,7 @@
        int error;
 
        error = md_get_int64(mdp, &v);
-       *x = betohq(v);
+       *x = be64toh(v);
        return error;
 }
 
@@ -515,7 +515,7 @@
        int error;
 
        error = md_get_int64(mdp, &v);
-       *x = letohq(v);
+       *x = le64toh(v);
        return error;
 }