aboutsummaryrefslogtreecommitdiff
path: root/util-linux/volume_id/get_devname.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/volume_id/get_devname.c')
-rw-r--r--util-linux/volume_id/get_devname.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 75060b0d8..af03d07a3 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -26,6 +26,10 @@ static struct uuidCache_s {
26} *uuidCache; 26} *uuidCache;
27 27
28/* for now, only ext2, ext3 and xfs are supported */ 28/* for now, only ext2, ext3 and xfs are supported */
29#if !ENABLE_FEATURE_VOLUMEID_ISO9660
30#define get_label_uuid(device, label, uuid, iso_only) \
31 get_label_uuid(device, label, uuid)
32#endif
29static int 33static int
30get_label_uuid(const char *device, char **label, char **uuid, int iso_only) 34get_label_uuid(const char *device, char **label, char **uuid, int iso_only)
31{ 35{
@@ -83,6 +87,10 @@ uuidcache_addentry(char * device, int major, int minor, char *label, char *uuid)
83 memcpy(last->uuid, uuid, sizeof(last->uuid)); 87 memcpy(last->uuid, uuid, sizeof(last->uuid));
84} 88}
85 89
90#if !ENABLE_FEATURE_VOLUMEID_ISO9660
91#define uuidcache_check_device(device_name, ma, mi, iso_only) \
92 uuidcache_check_device(device_name, ma, mi)
93#endif
86static void 94static void
87uuidcache_check_device(const char *device_name, int ma, int mi, int iso_only) 95uuidcache_check_device(const char *device_name, int ma, int mi, int iso_only)
88{ 96{