← Commit list

10d0d4eec

Denis Vlasenko
Denis Vlasenko
2006-11-27
FAILED Duration: 5s

Subject

byteswap ops had extra mask ops - removed

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

e2fsprogs/blkid/probe.h +6 -6util-linux/fdisk.c +7 -7util-linux/fdisk_sgi.c +2 -4util-linux/fdisk_sun.c +2 -4
e2fsprogs/blkid/probe.h+6 -6
@@ -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
util-linux/fdisk.c+7 -7
@@ -379,19 +379,19 @@ STATIC_OSF void xbsd_print_disklabel(int);
#define SGI_XVM 0x0d
#define SGI_ENTIRE_DISK SGI_VOLUME
#if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL)
-static unsigned short
-__swap16(unsigned short x)
+static uint16_t
+__swap16(uint16_t x)
{
- return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8);
+ return (x << 8) | (x >> 8);
}
static uint32_t
__swap32(uint32_t x)
{
- return (((x & 0xFF) << 24) |
- ((x & 0xFF00) << 8) |
- ((x & 0xFF0000) >> 8) |
- ((x & 0xFF000000) >> 24));
+ return (x << 24) |
+ ((x & 0xFF00) << 8) |
+ ((x & 0xFF0000) >> 8) |
+ (x >> 24);
}
#endif
util-linux/fdisk_sgi.c+2 -4
@@ -84,10 +84,8 @@ typedef struct {
#define SGI_INFO_MAGIC 0x00072959
#define SGI_INFO_MAGIC_SWAPPED 0x59290700
-#define SGI_SSWAP16(x) (sgi_other_endian ? __swap16(x) \
- : (uint16_t)(x))
-#define SGI_SSWAP32(x) (sgi_other_endian ? __swap32(x) \
- : (uint32_t)(x))
+#define SGI_SSWAP16(x) (sgi_other_endian ? __swap16(x) : (uint16_t)(x))
+#define SGI_SSWAP32(x) (sgi_other_endian ? __swap32(x) : (uint32_t)(x))
#define sgilabel ((sgi_partition *)MBRbuffer)
#define sgiparam (sgilabel->devparam)
util-linux/fdisk_sun.c+2 -4
@@ -2,10 +2,8 @@
#define SUN_LABEL_MAGIC 0xDABE
#define SUN_LABEL_MAGIC_SWAPPED 0xBEDA
-#define SUN_SSWAP16(x) (sun_other_endian ? __swap16(x) \
- : (uint16_t)(x))
-#define SUN_SSWAP32(x) (sun_other_endian ? __swap32(x) \
- : (uint32_t)(x))
+#define SUN_SSWAP16(x) (sun_other_endian ? __swap16(x) : (uint16_t)(x))
+#define SUN_SSWAP32(x) (sun_other_endian ? __swap32(x) : (uint32_t)(x))
/* Copied from linux/major.h */
#define FLOPPY_MAJOR 2