From 4d79445aafc0f1b7b807e1a04ec9217a52d3f3b8 Mon Sep 17 00:00:00 2001 From: "R. Imura" Date: Mon, 19 Sep 2005 08:07:18 +0000 Subject: [PATCH] Remove macros htole{s,l,q}, letoh{s,l,q}, htobe{s,l,q}, betoh{s,l,q} and replace it with more standard byteorder macros in our system. --- contrib/smbfs/lib/smb/mbuf.c | 18 ++++++------- contrib/smbfs/lib/smb/nb_name.c | 8 ++++-- contrib/smbfs/lib/smb/rap.c | 11 ++++---- contrib/smbfs/smbutil/view.c | 9 ++++--- sys/sys/mchain.h | 48 --------------------------------- 5 files changed, 26 insertions(+), 68 deletions(-) diff --git a/contrib/smbfs/lib/smb/mbuf.c b/contrib/smbfs/lib/smb/mbuf.c index 4980575e969d..729b5c53d11e 100644 --- a/contrib/smbfs/lib/smb/mbuf.c +++ b/contrib/smbfs/lib/smb/mbuf.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include -#include +#include #include #include #include @@ -268,7 +268,7 @@ int mb_put_int64be(struct mbdata *mbp, int64_t x) { MB_PUT(int64_t); - *p = htobeq(x); + *p = htobe64(x); return 0; } @@ -276,7 +276,7 @@ int mb_put_int64le(struct mbdata *mbp, int64_t x) { MB_PUT(int64_t); - *p = htoleq(x); + *p = htole64(x); return 0; } @@ -367,7 +367,7 @@ mb_get_uint16le(struct mbdata *mbp, u_int16_t *x) u_int16_t v; int error = mb_get_uint16(mbp, &v); - *x = letohs(v); + *x = le16toh(v); return error; } @@ -376,7 +376,7 @@ mb_get_uint16be(struct mbdata *mbp, u_int16_t *x) { u_int16_t v; int error = mb_get_uint16(mbp, &v); - *x = betohs(v); + *x = be16toh(v); return error; } @@ -393,7 +393,7 @@ mb_get_uint32be(struct mbdata *mbp, u_int32_t *x) int error; error = mb_get_uint32(mbp, &v); - *x = betohl(v); + *x = be32toh(v); return error; } @@ -404,7 +404,7 @@ mb_get_uint32le(struct mbdata *mbp, u_int32_t *x) int error; error = mb_get_uint32(mbp, &v); - *x = letohl(v); + *x = le32toh(v); return error; } @@ -421,7 +421,7 @@ mb_get_int64be(struct mbdata *mbp, int64_t *x) int error; error = mb_get_int64(mbp, &v); - *x = betohq(v); + *x = be64toh(v); return error; } @@ -432,7 +432,7 @@ mb_get_int64le(struct mbdata *mbp, int64_t *x) int error; error = mb_get_int64(mbp, &v); - *x = letohq(v); + *x = le64toh(v); return error; } diff --git a/contrib/smbfs/lib/smb/nb_name.c b/contrib/smbfs/lib/smb/nb_name.c index 01500c313a41..ad34489c1cc3 100644 --- a/contrib/smbfs/lib/smb/nb_name.c +++ b/contrib/smbfs/lib/smb/nb_name.c @@ -31,9 +31,13 @@ * * $Id: nb_name.c,v 1.2 2001/08/22 03:31:36 bp Exp $ */ + +#include +__FBSDID("$FreeBSD$"); + #include +#include #include -#include /* for endiand macros */ #include #include @@ -139,7 +143,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 e595bc1e1c28..19e803df9cce 100644 --- a/contrib/smbfs/lib/smb/rap.c +++ b/contrib/smbfs/lib/smb/rap.c @@ -35,6 +35,7 @@ * This is very simple implementation of RAP protocol. */ #include +#include #include #include #include @@ -45,8 +46,6 @@ #include #include -#include - #include #include #include @@ -290,7 +289,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 +319,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 +328,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 42450df26593..b8465df2ec9c 100644 --- a/contrib/smbfs/smbutil/view.c +++ b/contrib/smbfs/smbutil/view.c @@ -31,6 +31,11 @@ * * $Id: view.c,v 1.9 2002/02/20 09:26:42 bp Exp $ */ + +#include +__FBSDID("$FreeBSD$"); + +#include #include #include #include @@ -44,8 +49,6 @@ #include -#include - #include #include #include @@ -113,7 +116,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, diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h index 23f454ba5066..69775ffe2372 100644 --- a/sys/sys/mchain.h +++ b/sys/sys/mchain.h @@ -34,54 +34,6 @@ #ifndef _SYS_MCHAIN_H_ #define _SYS_MCHAIN_H_ -#include - -#ifndef _KERNEL -/* - * This macros probably belongs to the endian.h - */ -#if (BYTE_ORDER == LITTLE_ENDIAN) - -#define htoles(x) ((u_int16_t)(x)) -#define letohs(x) ((u_int16_t)(x)) -#define htolel(x) ((u_int32_t)(x)) -#define letohl(x) ((u_int32_t)(x)) -#define htoleq(x) ((int64_t)(x)) -#define letohq(x) ((int64_t)(x)) - -#define htobes(x) (__htons(x)) -#define betohs(x) (__ntohs(x)) -#define htobel(x) (__htonl(x)) -#define betohl(x) (__ntohl(x)) - -static __inline int64_t -htobeq(int64_t x) -{ - return (int64_t)__htonl((u_int32_t)(x >> 32)) | - (int64_t)__htonl((u_int32_t)(x & 0xffffffff)) << 32; -} - -static __inline int64_t -betohq(int64_t x) -{ - return (int64_t)__ntohl((u_int32_t)(x >> 32)) | - (int64_t)__ntohl((u_int32_t)(x & 0xffffffff)) << 32; -} - -#else /* (BYTE_ORDER == LITTLE_ENDIAN) */ - -#error "Macros for Big-Endians are incomplete" - -/* -#define htoles(x) ((u_int16_t)(x)) -#define letohs(x) ((u_int16_t)(x)) -#define htolel(x) ((u_int32_t)(x)) -#define letohl(x) ((u_int32_t)(x)) -*/ -#endif /* (BYTE_ORDER == LITTLE_ENDIAN) */ -#endif /* _KERNEL */ - - #ifdef _KERNEL /*