summaryrefslogtreecommitdiffstats
path: root/libblkid
diff options
context:
space:
mode:
Diffstat (limited to 'libblkid')
-rw-r--r--libblkid/src/probe.c4
-rw-r--r--libblkid/src/read.c32
2 files changed, 4 insertions, 32 deletions
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index f2b3f9348..da6720dae 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -740,6 +740,8 @@ int blkid_probe_is_cdrom(blkid_probe pr)
return (pr->flags & BLKID_FL_CDROM_DEV);
}
+#ifdef CDROM_GET_CAPABILITY
+
static int is_sector_readable(int fd, uint64_t sector)
{
char buf[512];
@@ -785,6 +787,8 @@ failed:
pr->size = n << 9;
}
+#endif
+
/**
* blkid_probe_set_device:
* @pr: probe
diff --git a/libblkid/src/read.c b/libblkid/src/read.c
index c081baff5..42867735f 100644
--- a/libblkid/src/read.c
+++ b/libblkid/src/read.c
@@ -32,11 +32,6 @@
# include <stdlib.h>
#endif
-#ifdef TEST_PROGRAM
-#define blkid_debug_dump_dev(dev) (debug_dump_dev(dev))
-static void debug_dump_dev(blkid_dev dev);
-#endif
-
/*
* File format:
*
@@ -377,8 +372,6 @@ static int blkid_parse_line(blkid_cache cache, blkid_dev *dev_p, char *cp)
goto done;
}
- /*DBG(READ, blkid_debug_dump_dev(dev));*/
-
done:
return ret;
}
@@ -452,31 +445,6 @@ errout:
}
#ifdef TEST_PROGRAM
-static void debug_dump_dev(blkid_dev dev)
-{
- struct list_head *p;
-
- if (!dev) {
- printf(" dev: NULL\n");
- return;
- }
-
- printf(" dev: name = %s\n", dev->bid_name);
- printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno);
- printf(" dev: TIME=\"%ld.%ld\"\n", (long)dev->bid_time, (long)dev->bid_utime);
- printf(" dev: PRI=\"%d\"\n", dev->bid_pri);
- printf(" dev: flags = 0x%08X\n", dev->bid_flags);
-
- list_for_each(p, &dev->bid_tags) {
- blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags);
- if (tag)
- printf(" tag: %s=\"%s\"\n", tag->bit_name,
- tag->bit_val);
- else
- printf(" tag: NULL\n");
- }
- printf("\n");
-}
int main(int argc, char**argv)
{