From: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue, 12 Jun 2012 04:57:26 +0000 (+1000)
Subject: Fix the swab* macros.
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=0298b541149eca4c30749085694526a0040d0982

Fix the swab* macros.

The macros a fundamentally broken as they reuse the argument several
times.  Replace them with static inline funcations that /should/ be
correct.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---

diff --git a/include/swab.h b/include/swab.h
index 40c7c8a..657b5f5 100644
--- a/include/swab.h
+++ b/include/swab.h
@@ -1,25 +1,29 @@
 #ifndef _REISERFS_SWAB_H_
 #define _REISERFS_SWAB_H_
 /* Stolen from linux/include/linux/byteorder/swab.h */
-#define swab16(x) \
-	((__u16)( \
-		(((__u16)(x) & (__u16)0x00ffU) << 8) | \
-		(((__u16)(x) & (__u16)0xff00U) >> 8) ))
-#define swab32(x) \
-	((__u32)( \
-		(((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
-		(((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
-		(((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
-		(((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
-#define swab64(x) \
-	((__u64)( \
-		(__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
-		(__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
-		(__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
-		(__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) | \
-	        (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) | \
-		(__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
-		(__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
-		(__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
+static inline __u16 swab16(__u16 x)
+{
+	return (((x & (__u16)0x00ffU) << 8) |
+		((x & (__u16)0xff00U) >> 8) );
+}
 
+static inline __u32 swab32(__u32 x)
+{
+	return (((x & (__u32)0x000000ffUL) << 24) |
+		((x & (__u32)0x0000ff00UL) <<  8) |
+		((x & (__u32)0x00ff0000UL) >>  8) |
+		((x & (__u32)0xff000000UL) >> 24) );
+}
+
+static inline __u64 swab64(__u64 x)
+{
+	return ((__u64)((x & (__u64)0x00000000000000ffULL) << 56) |
+		(__u64)((x & (__u64)0x000000000000ff00ULL) << 40) |
+		(__u64)((x & (__u64)0x0000000000ff0000ULL) << 24) |
+		(__u64)((x & (__u64)0x00000000ff000000ULL) <<  8) |
+	        (__u64)((x & (__u64)0x000000ff00000000ULL) >>  8) |
+		(__u64)((x & (__u64)0x0000ff0000000000ULL) >> 24) |
+		(__u64)((x & (__u64)0x00ff000000000000ULL) >> 40) |
+		(__u64)((x & (__u64)0xff00000000000000ULL) >> 56) );
+}
 #endif /* _REISERFS_SWAB_H_ */