diff options
| -rw-r--r-- | util-linux/volume_id/volume_id_internal.h | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h index 3f02bd50d..d3c6a6101 100644 --- a/util-linux/volume_id/volume_id_internal.h +++ b/util-linux/volume_id/volume_id_internal.h @@ -96,44 +96,24 @@ void FAST_FUNC free_volume_id(struct volume_id *id); /* size of seek buffer, FAT cluster is 32k max */ #define SEEK_BUFFER_SIZE 0x10000 -#define bswap16(x) (uint16_t) ( \ - (((uint16_t)(x) & 0x00ffu) << 8) | \ - (((uint16_t)(x) & 0xff00u) >> 8)) - -#define bswap32(x) (uint32_t) ( \ - (((uint32_t)(x) & 0xff000000u) >> 24) | \ - (((uint32_t)(x) & 0x00ff0000u) >> 8) | \ - (((uint32_t)(x) & 0x0000ff00u) << 8) | \ - (((uint32_t)(x) & 0x000000ffu) << 24)) - -#define bswap64(x) (uint64_t) ( \ - (((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \ - (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \ - (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \ - (((uint64_t)(x) & 0x000000ff00000000ull) >> 8) | \ - (((uint64_t)(x) & 0x00000000ff000000ull) << 8) | \ - (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \ - (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \ - (((uint64_t)(x) & 0x00000000000000ffull) << 56)) - #if BB_LITTLE_ENDIAN -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le64_to_cpu(x) (x) -#define be16_to_cpu(x) bswap16(x) -#define be32_to_cpu(x) bswap32(x) -#define cpu_to_le16(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_be32(x) bswap32(x) +# define le16_to_cpu(x) (uint16_t)(x) +# define le32_to_cpu(x) (uint32_t)(x) +# define le64_to_cpu(x) (uint64_t)(x) +# define be16_to_cpu(x) (uint16_t)(bswap_16(x)) +# define be32_to_cpu(x) (uint32_t)(bswap_32(x)) +# define cpu_to_le16(x) (uint16_t)(x) +# define cpu_to_le32(x) (uint32_t)(x) +# define cpu_to_be32(x) (uint32_t)(bswap_32(x)) #else -#define le16_to_cpu(x) bswap16(x) -#define le32_to_cpu(x) bswap32(x) -#define le64_to_cpu(x) bswap64(x) -#define be16_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define cpu_to_le16(x) bswap16(x) -#define cpu_to_le32(x) bswap32(x) -#define cpu_to_be32(x) (x) +# define le16_to_cpu(x) (uint16_t)(bswap_16(x)) +# define le32_to_cpu(x) (uint32_t)(bswap_32(x)) +# define le64_to_cpu(x) (uint64_t)(bb_bswap_64(x)) +# define be16_to_cpu(x) (uint16_t)(x) +# define be32_to_cpu(x) (uint32_t)(x) +# define cpu_to_le16(x) (uint16_t)(bswap_16(x)) +# define cpu_to_le32(x) (uint32_t)(bswap_32(x)) +# define cpu_to_be32(x) (uint32_t)(x) #endif /* volume_id_set_uuid(id,buf,fmt) assumes size of uuid buf |