summaryrefslogtreecommitdiffstats
path: root/libblkid
diff options
context:
space:
mode:
authorKarel Zak2019-01-02 14:44:59 +0100
committerKarel Zak2019-01-02 14:47:25 +0100
commit9b13b5602e16f719934b29d5efbf5a3aacf9832c (patch)
tree71e3608c1e10c7ea22aa082058559b8fda8f97aa /libblkid
parentchmem: add initilizer [clang] (diff)
downloadkernel-qcow2-util-linux-9b13b5602e16f719934b29d5efbf5a3aacf9832c.tar.gz
kernel-qcow2-util-linux-9b13b5602e16f719934b29d5efbf5a3aacf9832c.tar.xz
kernel-qcow2-util-linux-9b13b5602e16f719934b29d5efbf5a3aacf9832c.zip
libblkid: (ntfs) fix compiler warning [-Wpedantic]
libblkid/src/superblocks/ntfs.c:80:2: warning: ISO C restricts enumerator values to range of 'int' (4294967295 is too large) [-Wpedantic] Addressed: https://github.com/karelzak/util-linux/pull/732 Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid')
-rw-r--r--libblkid/src/superblocks/ntfs.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index 32973095b..5ea2a454a 100644
--- a/libblkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
@@ -75,10 +75,8 @@ struct file_attribute {
/* Windows 10 Creators edition has extended the cluster size limit to 2MB */
#define NTFS_MAX_CLUSTER_SIZE (2 * 1024 * 1024)
-enum {
- MFT_RECORD_ATTR_VOLUME_NAME = 0x60,
- MFT_RECORD_ATTR_END = 0xffffffff
-};
+#define MFT_RECORD_ATTR_VOLUME_NAME 0x60
+#define MFT_RECORD_ATTR_END 0xffffffff
static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
{
@@ -190,9 +188,9 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
if (!attr_len)
break;
- if (le32_to_cpu(attr->type) == MFT_RECORD_ATTR_END)
+ if (le32_to_cpu(attr->type) == (uint32_t) MFT_RECORD_ATTR_END)
break;
- if (le32_to_cpu(attr->type) == MFT_RECORD_ATTR_VOLUME_NAME) {
+ if (le32_to_cpu(attr->type) == (uint32_t) MFT_RECORD_ATTR_VOLUME_NAME) {
unsigned int val_off = le16_to_cpu(attr->value_offset);
unsigned int val_len = le32_to_cpu(attr->value_len);
unsigned char *val = ((uint8_t *) attr) + val_off;