misc: avoid shadowing

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 58fbce5d30dc993a0956f549d5ea4152a36ef4bf..71eb4a5334e402f420f199f9dc04149550a00451 100644 (file)
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -290,7 +290,7 @@ int blkid_devno_to_wholedisk(dev_t dev, char *diskname,
 /*
  * Returns 1 if the @major number is associated with @drvname.
  */
-int blkid_driver_has_major(const char *drvname, int major)
+int blkid_driver_has_major(const char *drvname, int drvmaj)
 {
        FILE *f;
        char buf[128];
@@ -312,7 +312,7 @@ int blkid_driver_has_major(const char *drvname, int major)
                if (sscanf(buf, "%d %64[^\n ]", &maj, name) != 2)
                        continue;
 
-               if (maj == major && strcmp(name, drvname) == 0) {
+               if (maj == drvmaj && strcmp(name, drvname) == 0) {
                        match = 1;
                        break;
                }
@@ -321,7 +321,7 @@ int blkid_driver_has_major(const char *drvname, int major)
        fclose(f);
 
        DBG(DEVNO, ul_debug("major %d %s associated with '%s' driver",
-                       major, match ? "is" : "is NOT", drvname));
+                       drvmaj, match ? "is" : "is NOT", drvname));
        return match;
 }
 
@@ -330,7 +330,7 @@ int main(int argc, char** argv)
 {
        char    *devname, *tmp;
        char    diskname[PATH_MAX];
-       int     major, minor;
+       int     devmaj, devmin;
        dev_t   devno, disk_devno;
        const char *errmsg = "Couldn't parse %s: %s\n";
 
@@ -348,17 +348,17 @@ int main(int argc, char** argv)
                        exit(1);
                }
        } else {
-               major = strtoul(argv[1], &tmp, 0);
+               devmaj = strtoul(argv[1], &tmp, 0);
                if (*tmp) {
                        fprintf(stderr, errmsg, "major number", argv[1]);
                        exit(1);
                }
-               minor = strtoul(argv[2], &tmp, 0);
+               devmin = strtoul(argv[2], &tmp, 0);
                if (*tmp) {
                        fprintf(stderr, errmsg, "minor number", argv[2]);
                        exit(1);
                }
-               devno = makedev(major, minor);
+               devno = makedev(devmaj, devmin);
        }
        printf("Looking for device 0x%04llx\n", (long long)devno);
        devname = blkid_devno_to_devname(devno);

diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index 7a16488f0dd761bd48ef0b874e256b0ddb865000..3f1e75c1383f9fcf166862e5e4099e3286ccf69c 100644 (file)
--- a/libblkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
@@ -19,8 +19,8 @@ struct exfat_super_block {
        uint32_t rootdir_cluster;
        uint8_t volume_serial[4];
        struct {
-               uint8_t minor;
-               uint8_t major;
+               uint8_t vermin;
+               uint8_t vermaj;
        } version;
        uint16_t volume_state;
        uint8_t block_bits;
@@ -130,7 +130,7 @@ static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag)
                        sb->volume_serial[1], sb->volume_serial[0]);
 
        blkid_probe_sprintf_version(pr, "%u.%u",
-                       sb->version.major, sb->version.minor);
+                       sb->version.vermaj, sb->version.vermin);
 
        return BLKID_PROBE_OK;
 }

diff --git a/libblkid/src/superblocks/f2fs.c b/libblkid/src/superblocks/f2fs.c
index 2bf0f5e98028036dc69b40380e2cb613f21bd8ed..d1bf25a3a5cd9a21151b06a9e8ffbbc22318b710 100644 (file)
--- a/libblkid/src/superblocks/f2fs.c
+++ b/libblkid/src/superblocks/f2fs.c
@@ -58,17 +58,17 @@ struct f2fs_super_block {                                   /* According to version 1.1 */
 static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag)
 {
        struct f2fs_super_block *sb;
-       uint16_t major, minor;
+       uint16_t vermaj, vermin;
 
        sb = blkid_probe_get_sb(pr, mag, struct f2fs_super_block);
        if (!sb)
                return errno ? -errno : 1;
 
-       major = le16_to_cpu(sb->major_ver);
-       minor = le16_to_cpu(sb->minor_ver);
+       vermaj = le16_to_cpu(sb->major_ver);
+       vermin = le16_to_cpu(sb->minor_ver);
 
        /* For version 1.0 we cannot know the correct sb structure */
-       if (major == 1 && minor == 0)
+       if (vermaj == 1 && vermin == 0)
                return 0;
 
        if (*((unsigned char *) sb->volume_name))
@@ -77,7 +77,7 @@ static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag)
                                                BLKID_ENC_UTF16LE);
 
        blkid_probe_set_uuid(pr, sb->uuid);
-       blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
+       blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
        return 0;
 }
 

diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
index 8ed28385fb13b0c094bd6d427722181266d9a602..7364beca22022e1896d74e2c3643b9d971e63305 100644 (file)
--- a/libblkid/src/superblocks/squashfs.c
+++ b/libblkid/src/superblocks/squashfs.c
@@ -31,19 +31,19 @@ struct sqsh_super_block {
 static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
        struct sqsh_super_block *sq;
-       uint16_t major;
-       uint16_t minor;
+       uint16_t vermaj;
+       uint16_t vermin;
 
        sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block);
        if (!sq)
                return errno ? -errno : 1;
 
-       major = le16_to_cpu(sq->s_major);
-       minor = le16_to_cpu(sq->s_minor);
-       if (major < 4)
+       vermaj = le16_to_cpu(sq->s_major);
+       vermin = le16_to_cpu(sq->s_minor);
+       if (vermaj < 4)
                return 1;
 
-       blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
+       blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
 
        return 0;
 }
@@ -51,25 +51,25 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
 static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
 {
        struct sqsh_super_block *sq;
-       uint16_t major;
-       uint16_t minor;
+       uint16_t vermaj;
+       uint16_t vermin;
 
        sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block);
        if (!sq)
                return errno ? -errno : 1;
 
        if (strcmp(mag->magic, "sqsh") == 0) {
-               major = be16_to_cpu(sq->s_major);
-               minor = be16_to_cpu(sq->s_minor);
+               vermaj = be16_to_cpu(sq->s_major);
+               vermin = be16_to_cpu(sq->s_minor);
        } else {
-               major = le16_to_cpu(sq->s_major);
-               minor = le16_to_cpu(sq->s_minor);
+               vermaj = le16_to_cpu(sq->s_major);
+               vermin = le16_to_cpu(sq->s_minor);
        }
 
-       if (major > 3)
+       if (vermaj > 3)
                return 1;
 
-       blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
+       blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
 
        return 0;
 }