aboutsummaryrefslogtreecommitdiffstats
path: root/lib/blkid
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2008-07-06 18:36:56 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-07-06 18:36:56 -0400
commit79e62409b3a247e258d9e9206484ed8f193a183e (patch)
treee00676924c5ba0e351c4a03f5b0b6873fb7e6b2d /lib/blkid
parentbf58e3d1c68be63d673d232154bde5854e031afc (diff)
downloadandroid_external_e2fsprogs-79e62409b3a247e258d9e9206484ed8f193a183e.tar.gz
android_external_e2fsprogs-79e62409b3a247e258d9e9206484ed8f193a183e.tar.bz2
android_external_e2fsprogs-79e62409b3a247e258d9e9206484ed8f193a183e.zip
Clean up some trivial build warnings
Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'lib/blkid')
-rw-r--r--lib/blkid/probe.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index d0d4b5db..77252a91 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -777,11 +777,11 @@ static int probe_jfs(struct blkid_probe *probe,
static int probe_zfs(struct blkid_probe *probe, struct blkid_magic *id,
unsigned char *buf)
{
+#if 0
char *vdev_label;
const char *pool_name = 0;
/* read nvpair data for pool name, pool GUID (complex) */
-#if 0
blkid_set_tag(probe->dev, "LABEL", pool_name, sizeof(pool_name));
set_uuid(probe->dev, pool_guid, 0);
#endif
@@ -1252,9 +1252,10 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
return dev;
DBG(DEBUG_PROBE,
- printf("need to revalidate %s (cache time %d, stat time %d,\n\t"
+ printf("need to revalidate %s (cache time %lu, stat time %lu,\n\t"
"time since last check %lu)\n",
- dev->bid_name, dev->bid_time, st.st_mtime, (unsigned long)diff));
+ dev->bid_name, (unsigned long)dev->bid_time,
+ (unsigned long)st.st_mtime, (unsigned long)diff));
if ((probe.fd = open(dev->bid_name, O_RDONLY)) < 0) {
DBG(DEBUG_PROBE, printf("blkid_verify: error %s (%d) while "