From 10d0d4eec7e3a292917f43f72afae20341d9ba11 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 27 Nov 2006 16:48:17 +0000 Subject: byteswap ops had extra mask ops - removed --- e2fsprogs/blkid/probe.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'e2fsprogs') diff --git a/e2fsprogs/blkid/probe.h b/e2fsprogs/blkid/probe.h index e1b65246a..78f796419 100644 --- a/e2fsprogs/blkid/probe.h +++ b/e2fsprogs/blkid/probe.h @@ -327,8 +327,8 @@ _INLINE_ __u16 blkid_swab16(__u16 val) _INLINE_ __u64 blkid_swab64(__u64 val) { - return (blkid_swab32(val >> 32) | - (((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32)); + return blkid_swab32(val >> 32) | + ( ((__u64)blkid_swab32((__u32)val)) << 32 ); } #endif @@ -341,14 +341,14 @@ _INLINE_ __u16 blkid_swab16(__u16 val) _INLINE_ __u32 blkid_swab32(__u32 val) { - return ((val>>24) | ((val>>8)&0xFF00) | - ((val<<8)&0xFF0000) | (val<<24)); + return (val>>24) | ((val>>8) & 0xFF00) | + ((val<<8) & 0xFF0000) | (val<<24); } _INLINE_ __u64 blkid_swab64(__u64 val) { - return (blkid_swab32(val >> 32) | - (((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32)); + return blkid_swab32(val >> 32) | + ( ((__u64)blkid_swab32((__u32)val)) << 32 ); } #endif -- cgit v1.2.3