From d5ac5df3592dd84c7aa9537f5b9a3d1348af2a9c Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Wed, 25 Jul 2012 21:15:22 +0200 Subject: [PATCH] mkswap: fix shadow declaration 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 --- disk-utils/mkswap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index ca49d0e34f..34fe687d12 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -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; -- 2.47.3