[PATCH] libblkid: fix compiler warnings

[PATCH] libblkid: fix compiler warnings

[Sami Kerola]

warning: extra ';' outside of a function [-Wextra-semi]

warning: embedding a directive within macro arguments has undefined
behavior [-Wembedded-directive]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 libblkid/src/superblocks/bcache.c | 2 +-
 libblkid/src/superblocks/minix.c  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index 4fb16bd..ba9cf32 100644
--- a/libblkid/src/superblocks/bcache.c
+++ b/libblkid/src/superblocks/bcache.c
@@ -117,7 +117,7 @@ static int probe_bcache (blkid_probe pr, const struct blkid_idmag *mag)
 		return BLKID_PROBE_NONE;
 
 	return BLKID_PROBE_OK;
-};
+}
 
 const struct blkid_idinfo bcache_idinfo =
 {
diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c
index 9ea49fe..d6d45bd 100644
--- a/libblkid/src/superblocks/minix.c
+++ b/libblkid/src/superblocks/minix.c
@@ -21,6 +21,7 @@ static int get_minix_version(const unsigned char *data, int *other_endian)
 	struct minix_super_block *sb = (struct minix_super_block *) data;
 	struct minix3_super_block *sb3 = (struct minix3_super_block *) data;
 	int version = 0;
+	char *endian;
 
 	*other_endian = 0;
 
@@ -60,13 +61,13 @@ static int get_minix_version(const unsigned char *data, int *other_endian)
 	if (!version)
 		return -1;
 
-	DBG(LOWPROBE, ul_debug("minix version %d detected [%s]", version,
 #if defined(WORDS_BIGENDIAN)
-	*other_endian ? "LE" : "BE"
+	endian = *other_endian ? "LE" : "BE";
 #else
-	*other_endian ? "BE" : "LE"
+	endian = *other_endian ? "BE" : "LE";
 #endif
-	));
+	DBG(LOWPROBE, ul_debug("minix version %d detected [%s]", version,
+			       endian));
 	return version;
 }
 
-- 
2.3.3

Re: [PATCH] libblkid: fix compiler warnings

[Karel Zak]

On Mon, Mar 16, 2015 at 11:55:47PM +0000, Sami Kerola wrote:
>  libblkid/src/superblocks/bcache.c | 2 +-
>  libblkid/src/superblocks/minix.c  | 9 +++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com