From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Mon, 22 Feb 2016 21:23:38 +0000 (+0100)
Subject: libblkid: fix compiler warnings [-Wmissing-prototypes]
X-Git-Tag: v2.28-rc1~67^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b55b9fccf6c1f06ba3e8cfb8ee6ee3df5f02c777;p=thirdparty%2Futil-linux.git

libblkid: fix compiler warnings [-Wmissing-prototypes]

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

diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 0b5e68099b..7c37dfb96f 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -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;
diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index d099467a22..8991c6b9f3 100644
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 
 #include "superblocks.h"
+#include "iso9660.h"
 
 struct iso9660_date {
 	unsigned char year[4];
diff --git a/libblkid/src/superblocks/linux_raid.c b/libblkid/src/superblocks/linux_raid.c
index dee293b414..e60c5e597b 100644
--- a/libblkid/src/superblocks/linux_raid.c
+++ b/libblkid/src/superblocks/linux_raid.c
@@ -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;
diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c
index 50a71c9cfb..a4f598dfbf 100644
--- a/libblkid/src/superblocks/vfat.c
+++ b/libblkid/src/superblocks/vfat.c
@@ -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.