From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Tue, 25 Sep 2018 22:37:28 +0000 (+0200)
Subject: libfdisk: fix OSX compiler warning
X-Git-Tag: v2.33-rc2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5e3a87cdb4ab47fd2ce9c4eb4dd3ca29af4bd36;p=thirdparty%2Futil-linux.git

libfdisk: fix OSX compiler warning

libfdisk/src/context.c:1354:54: error: unused parameter 'cxt' [-Werror,-Wunused-parameter]
const char *fdisk_get_devmodel(struct fdisk_context *cxt)

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index ad5f99de49..18ebeba18f 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -1351,9 +1351,9 @@ dev_t fdisk_get_devno(struct fdisk_context *cxt)
  *
  * Returns: device model string or NULL.
  */
+#ifdef __linux__
 const char *fdisk_get_devmodel(struct fdisk_context *cxt)
 {
-#ifdef __linux__
 	assert(cxt);
 
 	if (cxt->dev_model_probed)
@@ -1369,11 +1369,13 @@ const char *fdisk_get_devmodel(struct fdisk_context *cxt)
 	}
 	cxt->dev_model_probed = 1;
 	return cxt->dev_model;
+}
 #else
+const char *fdisk_get_devmodel(struct fdisk_context *cxt __attribute__((__unused__)))
+{
 	return NULL;
-#endif
-
 }
+#endif
 
 /**
  * fdisk_get_devfd: