diff options
author | Sami Kerola | 2012-07-25 21:15:22 +0200 |
---|---|---|
committer | Karel Zak | 2012-07-26 11:09:31 +0200 |
commit | d5ac5df3592dd84c7aa9537f5b9a3d1348af2a9c (patch) | |
tree | 5f7739fde17b256cbbcedbf9889af90a305fb632 /disk-utils | |
parent | tests: look: add words file (diff) | |
download | kernel-qcow2-util-linux-d5ac5df3592dd84c7aa9537f5b9a3d1348af2a9c.tar.gz kernel-qcow2-util-linux-d5ac5df3592dd84c7aa9537f5b9a3d1348af2a9c.tar.xz kernel-qcow2-util-linux-d5ac5df3592dd84c7aa9537f5b9a3d1348af2a9c.zip |
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 <kerolasa@iki.fi>
Diffstat (limited to 'disk-utils')
-rw-r--r-- | disk-utils/mkswap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index ca49d0e34..34fe687d1 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; |