diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-27 16:48:17 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-27 16:48:17 +0000 |
| commit | 10d0d4eec7e3a292917f43f72afae20341d9ba11 (patch) | |
| tree | eb2f62d0756ae38bde76d61c15b9f3ddd3c41941 /e2fsprogs | |
| parent | 3ece72dc3f95d195924c760f9ee5059e35908564 (diff) | |
| download | busybox-w32-10d0d4eec7e3a292917f43f72afae20341d9ba11.tar.gz busybox-w32-10d0d4eec7e3a292917f43f72afae20341d9ba11.tar.bz2 busybox-w32-10d0d4eec7e3a292917f43f72afae20341d9ba11.zip | |
byteswap ops had extra mask ops - removed
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/blkid/probe.h | 12 |
1 files changed, 6 insertions, 6 deletions
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) | |||
| 327 | 327 | ||
| 328 | _INLINE_ __u64 blkid_swab64(__u64 val) | 328 | _INLINE_ __u64 blkid_swab64(__u64 val) |
| 329 | { | 329 | { |
| 330 | return (blkid_swab32(val >> 32) | | 330 | return blkid_swab32(val >> 32) | |
| 331 | (((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32)); | 331 | ( ((__u64)blkid_swab32((__u32)val)) << 32 ); |
| 332 | } | 332 | } |
| 333 | #endif | 333 | #endif |
| 334 | 334 | ||
| @@ -341,14 +341,14 @@ _INLINE_ __u16 blkid_swab16(__u16 val) | |||
| 341 | 341 | ||
| 342 | _INLINE_ __u32 blkid_swab32(__u32 val) | 342 | _INLINE_ __u32 blkid_swab32(__u32 val) |
| 343 | { | 343 | { |
| 344 | return ((val>>24) | ((val>>8)&0xFF00) | | 344 | return (val>>24) | ((val>>8) & 0xFF00) | |
| 345 | ((val<<8)&0xFF0000) | (val<<24)); | 345 | ((val<<8) & 0xFF0000) | (val<<24); |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | _INLINE_ __u64 blkid_swab64(__u64 val) | 348 | _INLINE_ __u64 blkid_swab64(__u64 val) |
| 349 | { | 349 | { |
| 350 | return (blkid_swab32(val >> 32) | | 350 | return blkid_swab32(val >> 32) | |
| 351 | (((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32)); | 351 | ( ((__u64)blkid_swab32((__u32)val)) << 32 ); |
| 352 | } | 352 | } |
| 353 | #endif | 353 | #endif |
| 354 | 354 | ||