Whamcloud - gitweb
libblkid: Fix marginal C code in probe_lvm2()
authorTheodore Ts'o <tytso@mit.edu>
Tue, 17 Jun 2008 17:03:47 +0000 (13:03 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 17 Jun 2008 17:03:47 +0000 (13:03 -0400)
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>
lib/blkid/probe.c

index f548d08..ccfc486 100644 (file)
@@ -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;