From: Karel Zak <kzak@redhat.com>
Date: Thu, 5 Jan 2017 10:53:56 +0000 (+0100)
Subject: sfdisk: unused parameter 'sf' [-Wunused-parameter]
X-Git-Tag: v2.30-rc1~322
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11e1097e6c6d499228c84609523d8d1976be21a3;p=thirdparty%2Futil-linux.git

sfdisk: unused parameter 'sf' [-Wunused-parameter]

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

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index fb9fa499a6..c6d57eacc7 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1390,9 +1390,9 @@ static size_t last_pt_partno(struct sfdisk *sf)
 	return partno;
 }
 
+#ifdef BLKRRPART
 static int is_device_used(struct sfdisk *sf)
 {
-#ifdef BLKRRPART
 	struct stat st;
 	int fd;
 
@@ -1406,9 +1406,14 @@ static int is_device_used(struct sfdisk *sf)
 	if (fstat(fd, &st) == 0 && S_ISBLK(st.st_mode)
 	    && major(st.st_rdev) != LOOPDEV_MAJOR)
 		return ioctl(fd, BLKRRPART) != 0;
-#endif
 	return 0;
 }
+#else
+static int is_device_used(struct sfdisk *sf __attribute__((__unused__)))
+{
+	return 0;
+}
+#endif
 
 #ifdef HAVE_LIBREADLINE
 static char *sfdisk_fgets(struct fdisk_script *dp,