aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2008-06-17 13:03:47 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-06-17 13:03:47 -0400
commitcc19b958602775ef48f347d16859ce6623a385da (patch)
tree8c42a41f62b2a705fd51afb84c5a78f81c3456cb /lib
parent04310e3fecb57340affd0b2e09abb16b6ba52719 (diff)
downloadandroid_external_e2fsprogs-cc19b958602775ef48f347d16859ce6623a385da.tar.gz
android_external_e2fsprogs-cc19b958602775ef48f347d16859ce6623a385da.tar.bz2
android_external_e2fsprogs-cc19b958602775ef48f347d16859ce6623a385da.zip
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/blkid/probe.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index f548d08e..ccfc486a 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;