From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 17 Jun 2008 17:03:47 +0000 (-0400)
Subject: libblkid: Fix marginal C code in probe_lvm2()
X-Git-Tag: v1.40.11~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc19b958602775ef48f347d16859ce6623a385da;p=thirdparty%2Fe2fsprogs.git

libblkid: Fix marginal C code in probe_lvm2()

Modern gcc accepted what was there previously, but it's clearly not
correct C code, and this may have been the explanation for why a user
trying to compile a recent version of e2fsprogs failed to do so on Red
Hat 7.3.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index f548d08e0..ccfc486ac 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -1056,12 +1056,11 @@ static unsigned int lvm2_calc_crc(const void *buf, unsigned int size)
 }
 
 static int probe_lvm2(struct blkid_probe *probe,
-			struct blkid_magic *id __BLKID_ATTR((unused)),
+			struct blkid_magic *id,
 			unsigned char *buf)
 {
 	int sector = (id->bim_kboff) << 1;;
-	struct lvm2_pv_label_header *label;
-	label = (struct lvm2_pv_label_header *)buf;
+	struct lvm2_pv_label_header *label= (struct lvm2_pv_label_header *)buf;
 	char *p, *q, uuid[40];
 	unsigned int i, b;