libblkid: [partitions] fix compiler warnings [-Wunused-parameter -Wsign-compare]

Signed-off-by: Karel Zak <kzak@redhat.com>

11 files changed, 38 insertions, 28 deletions

diff --git a/libblkid/src/partitions/aix.c b/libblkid/src/partitions/aix.c
index be0ad2b46..de397bf4a 100644
--- a/libblkid/src/partitions/aix.c
+++ b/libblkid/src/partitions/aix.c
@@ -14,7 +14,8 @@
 #include "partitions.h"
 #include "aix.h"
 
-static int probe_aix_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_aix_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	blkid_partlist ls;
 	blkid_parttable tab;
diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c
index 72ac7788c..22d2625df 100644
--- a/libblkid/src/partitions/dos.c
+++ b/libblkid/src/partitions/dos.c
@@ -128,7 +128,8 @@ err:
 	return -1;
 }
 
-static int probe_dos_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_dos_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	int i;
 	int ssf;
@@ -240,7 +241,7 @@ static int probe_dos_pt(blkid_probe pr, const struct blkid_idmag *mag)
 	/* Parse subtypes (nested partitions) on large disks */
 	if (!blkid_probe_is_tiny(pr)) {
 		for (p = p0, i = 0; i < 4; i++, p++) {
-			int n;
+			size_t n;
 
 			if (!dos_partition_size(p) || is_extended(p))
 				continue;
diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c
index 9281a8943..c0517c427 100644
--- a/libblkid/src/partitions/gpt.c
+++ b/libblkid/src/partitions/gpt.c
@@ -287,16 +287,16 @@ static struct gpt_header *get_gpt_header(
 	return h;
 }
 
-static int probe_gpt_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_gpt_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	uint64_t lastlba = 0, lba;
 	struct gpt_header hdr, *h;
 	struct gpt_entry *e;
 	blkid_parttable tab = NULL;
 	blkid_partlist ls;
-	int i;
 	uint64_t fu, lu;
-	uint32_t ssf;
+	uint32_t ssf, i;
 
 
 	if (last_lba(pr, &lastlba))
diff --git a/libblkid/src/partitions/mac.c b/libblkid/src/partitions/mac.c
index 538b27270..4715ab6b6 100644
--- a/libblkid/src/partitions/mac.c
+++ b/libblkid/src/partitions/mac.c
@@ -71,15 +71,15 @@ static inline int has_part_signature(struct mac_partition *p)
 		be16_to_cpu(p->signature) == MAC_PARTITION_MAGIC_OLD;
 }
 
-static int probe_mac_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_mac_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct mac_driver_desc *md;
 	struct mac_partition *p;
 	blkid_parttable tab = NULL;
 	blkid_partlist ls;
-	int i;
 	uint16_t ssf;	/* sector size fragment */
-	uint32_t nblks;
+	uint32_t nblks, i;
 
 
 	/* The driver descriptor record is always located at physical block 0,
diff --git a/libblkid/src/partitions/minix.c b/libblkid/src/partitions/minix.c
index b67d2c7b9..bd57a6d4b 100644
--- a/libblkid/src/partitions/minix.c
+++ b/libblkid/src/partitions/minix.c
@@ -15,7 +15,8 @@
 #include "dos.h"
 #include "minix.h"
 
-static int probe_minix_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_minix_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct dos_partition *p;
 	blkid_parttable tab = NULL;
diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index a73181234..86bf43224 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -339,7 +339,7 @@ static void free_parttables(blkid_partlist ls)
 	}
 }
 
-static void reset_partlist(blkid_probe pr, blkid_partlist ls)
+static void reset_partlist(blkid_partlist ls)
 {
 	if (!ls)
 		return;
@@ -364,7 +364,7 @@ static void reset_partlist(blkid_probe pr, blkid_partlist ls)
 	DBG(DEBUG_LOWPROBE, printf("partlist reseted\n"));
 }
 
-static blkid_partlist partitions_init_data(blkid_probe pr, struct blkid_chain *chn)
+static blkid_partlist partitions_init_data(struct blkid_chain *chn)
 {
 	blkid_partlist ls;
 
@@ -378,7 +378,7 @@ static blkid_partlist partitions_init_data(blkid_probe pr, struct blkid_chain *c
 		chn->data = (void *) ls;
 	}
 
-	reset_partlist(pr, ls);
+	reset_partlist(ls);
 
 	DBG(DEBUG_LOWPROBE,
 		printf("parts: initialized partitions list (%p, size=%d)\n",
@@ -386,7 +386,8 @@ static blkid_partlist partitions_init_data(blkid_probe pr, struct blkid_chain *c
 	return ls;
 }
 
-static void partitions_free_data(blkid_probe pr, void *data)
+static void partitions_free_data(blkid_probe pr __attribute__((__unused__)),
+				 void *data)
 {
 	blkid_partlist ls = (blkid_partlist) data;
 
@@ -547,7 +548,7 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id)
 		rc = id->probefunc(pr, mag);
 	        if (rc == -1) {
 			/* reset after error */
-			reset_partlist(pr, blkid_probe_get_partlist(pr));
+			reset_partlist(blkid_probe_get_partlist(pr));
 			DBG(DEBUG_LOWPROBE, printf(
 				"%s probefunc failed\n", id->name));
 		}
@@ -564,14 +565,15 @@ nothing:
  */
 static int partitions_probe(blkid_probe pr, struct blkid_chain *chn)
 {
-	int i = 0, rc = 1;
+	int rc = 1;
+	size_t i;
 
 	if (!pr || chn->idx < -1)
 		return -1;
 	blkid_probe_chain_reset_vals(pr, chn);
 
 	if (chn->binary)
-		partitions_init_data(pr, chn);
+		partitions_init_data(chn);
 
 	if (!pr->wipe_size && (pr->prob_flags & BLKID_PROBE_FL_IGNORE_PT))
 		goto details_only;
@@ -580,7 +582,7 @@ static int partitions_probe(blkid_probe pr, struct blkid_chain *chn)
 		printf("--> starting probing loop [PARTS idx=%d]\n",
 		chn->idx));
 
-	i = chn->idx + 1;
+	i = chn->idx < 0 ? 0 : chn->idx + 1U;
 
 	for ( ; i < ARRAY_SIZE(idinfos); i++) {
 		const char *name;
@@ -830,7 +832,7 @@ done:
  */
 int blkid_known_pttype(const char *pttype)
 {
-	int i;
+	size_t i;
 
 	if (!pttype)
 		return 0;
@@ -962,7 +964,7 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno
 			 if (partno != blkid_partition_get_partno(par))
 				 continue;
 
-			 if (size == blkid_partition_get_size(par) ||
+			 if ((blkid_loff_t) size == blkid_partition_get_size(par) ||
 			     (blkid_partition_is_extended(par) && size <= 1024))
 				 return par;
 
@@ -975,12 +977,12 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno
 	for (i = 0; i < ls->nparts; i++) {
 		blkid_partition par = &ls->parts[i];
 
-		if (blkid_partition_get_start(par) == start &&
-		    blkid_partition_get_size(par) == size)
+		if (blkid_partition_get_start(par) == (blkid_loff_t) start &&
+		    blkid_partition_get_size(par) == (blkid_loff_t) size)
 			return par;
 
 		/* exception for extended dos partitions */
-		if (blkid_partition_get_start(par) == start &&
+		if (blkid_partition_get_start(par) == (blkid_loff_t) start &&
 		    blkid_partition_is_extended(par) && size <= 1024)
 			return par;
 
diff --git a/libblkid/src/partitions/sgi.c b/libblkid/src/partitions/sgi.c
index 945ead542..b89e46320 100644
--- a/libblkid/src/partitions/sgi.c
+++ b/libblkid/src/partitions/sgi.c
@@ -89,7 +89,8 @@ static uint32_t count_checksum(struct sgi_disklabel *label)
 }
 
 
-static int probe_sgi_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_sgi_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct sgi_disklabel *l;
 	struct sgi_partition *p;
diff --git a/libblkid/src/partitions/solaris_x86.c b/libblkid/src/partitions/solaris_x86.c
index ce102bd8f..7824f4ee7 100644
--- a/libblkid/src/partitions/solaris_x86.c
+++ b/libblkid/src/partitions/solaris_x86.c
@@ -57,7 +57,8 @@ struct solaris_vtoc {
 	char         v_asciilabel[128];	/* for compatibility */
 } __attribute__((packed));
 
-static int probe_solaris_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_solaris_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct solaris_vtoc *l;	/* disk label */
 	struct solaris_slice *p;	/* partitsion */
diff --git a/libblkid/src/partitions/sun.c b/libblkid/src/partitions/sun.c
index dffab24c6..f151f46ae 100644
--- a/libblkid/src/partitions/sun.c
+++ b/libblkid/src/partitions/sun.c
@@ -80,7 +80,8 @@ uint16_t count_checksum(struct sun_disklabel *label)
 	return sum;
 }
 
-static int probe_sun_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_sun_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct sun_disklabel *l;
 	struct sun_partition *p;
diff --git a/libblkid/src/partitions/ultrix.c b/libblkid/src/partitions/ultrix.c
index cc848d0a6..f637c5474 100644
--- a/libblkid/src/partitions/ultrix.c
+++ b/libblkid/src/partitions/ultrix.c
@@ -32,7 +32,8 @@ struct ultrix_disklabel {
 } __attribute__((packed));
 
 
-static int probe_ultrix_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_ultrix_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	unsigned char *data;
 	struct ultrix_disklabel *l;
diff --git a/libblkid/src/partitions/unixware.c b/libblkid/src/partitions/unixware.c
index ac11a46d3..e9bcba358 100644
--- a/libblkid/src/partitions/unixware.c
+++ b/libblkid/src/partitions/unixware.c
@@ -94,7 +94,8 @@ struct unixware_disklabel {
 	} __attribute__((packed)) vtoc;
 };
 
-static int probe_unixware_pt(blkid_probe pr, const struct blkid_idmag *mag)
+static int probe_unixware_pt(blkid_probe pr,
+		const struct blkid_idmag *mag __attribute__((__unused__)))
 {
 	struct unixware_disklabel *l;
 	struct unixware_partition *p;