]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
mkswap: fix shadow declaration
authorSami Kerola <kerolasa@iki.fi>
Wed, 25 Jul 2012 19:15:22 +0000 (21:15 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 26 Jul 2012 09:09:31 +0000 (11:09 +0200)
disk-utils/mkswap.c:366:57: warning: declaration of 'is_blkdev' shadows a global declaration [-Wshadow]
./include/blkdev.h:92:5: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
disk-utils/mkswap.c

index ca49d0e34f407925eb59d61675a9e1af46488048..34fe687d129e5c610e7abb4be0b137eaef5f0477 100644 (file)
@@ -363,7 +363,7 @@ new_prober(int fd)
 #endif
 
 static void
-wipe_device(int fd, const char *devname, int force, int is_blkdev)
+wipe_device(int fd, const char *devname, int force, int is_blkdevice)
 {
        char *type = NULL;
        int whole = 0;
@@ -375,7 +375,7 @@ wipe_device(int fd, const char *devname, int force, int is_blkdev)
                if (lseek(fd, 0, SEEK_SET) != 0)
                        errx(EXIT_FAILURE, _("unable to rewind swap-device"));
 
-               if (is_blkdev && is_whole_disk_fd(fd, devname)) {
+               if (is_blkdevice && is_whole_disk_fd(fd, devname)) {
                        /* don't zap bootbits on whole disk -- we know nothing
                         * about bootloaders on the device */
                        whole = 1;