]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: fix compiler warnings [-Wmissing-prototypes]
authorRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 22 Feb 2016 21:23:38 +0000 (22:23 +0100)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Tue, 23 Feb 2016 00:25:07 +0000 (01:25 +0100)
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
libblkid/src/partitions/partitions.c
libblkid/src/superblocks/iso9660.c
libblkid/src/superblocks/linux_raid.c
libblkid/src/superblocks/vfat.c

index 0b5e68099bc4c546f81a52b228ab1a11eea42e80..7c37dfb96f7748d45697eecde6514ea2fc9ff598 100644 (file)
@@ -481,7 +481,7 @@ int blkid_partlist_increment_partno(blkid_partlist ls)
 }
 
 /* allows to set "parent" for the next nested partition */
-int blkid_partlist_set_parent(blkid_partlist ls, blkid_partition par)
+static int blkid_partlist_set_parent(blkid_partlist ls, blkid_partition par)
 {
        if (!ls)
                return -1;
index d099467a22530799d39e11f9812700b44cbafeda..8991c6b9f339b9d5ce775300943da434e10cb429 100644 (file)
@@ -19,6 +19,7 @@
 #include <ctype.h>
 
 #include "superblocks.h"
+#include "iso9660.h"
 
 struct iso9660_date {
        unsigned char year[4];
index dee293b4142b5201989a8434d5e684deb8d5b554..e60c5e597b8d19c8b65676149db01d17a5e3bc6a 100644 (file)
@@ -212,7 +212,7 @@ static int probe_raid1(blkid_probe pr, off_t off)
        return 0;
 }
 
-int probe_raid(blkid_probe pr,
+static int probe_raid(blkid_probe pr,
                const struct blkid_idmag *mag __attribute__((__unused__)))
 {
        const char *ver = NULL;
index 50a71c9cfbbb3e3d4031d2db8efc59ee6bea37b5..a4f598dfbf0acd33318f158cf54cd83061cee194 100644 (file)
@@ -262,6 +262,9 @@ static int fat_valid_superblock(blkid_probe pr,
        return 1;       /* valid */
 }
 
+/* function prototype to avoid warnings (duplicate in partitions/dos.c) */
+extern int blkid_probe_is_vfat(blkid_probe pr);
+
 /*
  * This function is used by MBR partition table parser to avoid
  * misinterpretation of FAT filesystem.