From 6575d8f4e7a4f57a94ca6ba9846f1a2b711ac861 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 31 Oct 2023 20:55:14 +0100 Subject: [PATCH] libblkid: make enum libblkid_endianness lowercase MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As discussed in #2548 Signed-off-by: Thomas Weißschuh --- libblkid/src/superblocks/squashfs.c | 2 +- libblkid/src/superblocks/superblocks.c | 2 +- libblkid/src/superblocks/superblocks.h | 6 +++--- libblkid/src/superblocks/swap.c | 2 +- libblkid/src/superblocks/vxfs.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c index 92ab77a247..9543c46cca 100644 --- a/libblkid/src/superblocks/squashfs.c +++ b/libblkid/src/superblocks/squashfs.c @@ -66,7 +66,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag) struct sqsh_super_block *sq; uint16_t vermaj; uint16_t vermin; - enum BLKID_ENDIANNESS endianness; + enum blkid_endianness endianness; sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block); if (!sq) diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c index f64b19aef1..dd1e6dcf31 100644 --- a/libblkid/src/superblocks/superblocks.c +++ b/libblkid/src/superblocks/superblocks.c @@ -626,7 +626,7 @@ int blkid_probe_set_fsblocksize(blkid_probe pr, uint32_t block_size) block_size); } -int blkid_probe_set_fsendianness(blkid_probe pr, enum BLKID_ENDIANNESS endianness) +int blkid_probe_set_fsendianness(blkid_probe pr, enum blkid_endianness endianness) { struct blkid_chain *chn = blkid_probe_get_chain(pr); const char *value; diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h index b02c9c6f03..dc669e0fa0 100644 --- a/libblkid/src/superblocks/superblocks.h +++ b/libblkid/src/superblocks/superblocks.h @@ -9,7 +9,7 @@ #include "blkidP.h" -enum BLKID_ENDIANNESS { +enum blkid_endianness { BLKID_ENDIANNESS_LITTLE, BLKID_ENDIANNESS_BIG, }; @@ -128,7 +128,7 @@ int blkid_probe_set_block_size(blkid_probe pr, unsigned block_size); int blkid_probe_set_fssize(blkid_probe pr, uint64_t size); int blkid_probe_set_fslastblock(blkid_probe pr, uint64_t lastblock); int blkid_probe_set_fsblocksize(blkid_probe pr, uint32_t block_size); -int blkid_probe_set_fsendianness(blkid_probe pr, enum BLKID_ENDIANNESS endianness); +int blkid_probe_set_fsendianness(blkid_probe pr, enum blkid_endianness endianness); extern int blkid_probe_is_bitlocker(blkid_probe pr); extern int blkid_probe_is_ntfs(blkid_probe pr); @@ -136,7 +136,7 @@ extern int blkid_probe_is_ntfs(blkid_probe pr); /* * utility functions */ -static inline int blkid32_to_cpu(enum BLKID_ENDIANNESS e, uint32_t i) +static inline int blkid32_to_cpu(enum blkid_endianness e, uint32_t i) { if (e == BLKID_ENDIANNESS_LITTLE) return le32_to_cpu(i); diff --git a/libblkid/src/superblocks/swap.c b/libblkid/src/superblocks/swap.c index c7fbec3088..487690517f 100644 --- a/libblkid/src/superblocks/swap.c +++ b/libblkid/src/superblocks/swap.c @@ -40,7 +40,7 @@ static void swap_set_info_swap1(blkid_probe pr, const struct blkid_idmag *mag, const struct swap_header_v1_2 *hdr) { - enum BLKID_ENDIANNESS endianness = le32_to_cpu(hdr->version) == 1 ? + enum blkid_endianness endianness = le32_to_cpu(hdr->version) == 1 ? BLKID_ENDIANNESS_LITTLE : BLKID_ENDIANNESS_BIG; blkid_probe_set_fsendianness(pr, endianness); diff --git a/libblkid/src/superblocks/vxfs.c b/libblkid/src/superblocks/vxfs.c index 1df87343ec..950bc09cf8 100644 --- a/libblkid/src/superblocks/vxfs.c +++ b/libblkid/src/superblocks/vxfs.c @@ -26,7 +26,7 @@ struct vxfs_super_block { static int probe_vxfs(blkid_probe pr, const struct blkid_idmag *mag) { struct vxfs_super_block *vxs; - enum BLKID_ENDIANNESS e = mag->hint; + enum blkid_endianness e = mag->hint; vxs = blkid_probe_get_sb(pr, mag, struct vxfs_super_block); if (!vxs) -- 2.47.3