libblkid: fix compiler warnings

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>

diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c
index 4fb16bde2b595885cc7e6f0eff735db066f171d9..ba9cf327067694c7744c2bfbfd84c3eb52d0cdd5 100644 (file)
--- 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 9ea49fee878587cdffe872aa4cc4d2e44027a2b5..d6d45bd9b767e9bbf1697b3f4c39a79d696fef92 100644 (file)
--- 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;
 }