volume_id: remove s390 dasd handling, it is dasd_id now

[elogind.git] / extras / volume_id / volume_id / volume_id.h

diff --git a/extras/volume_id/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h
index a8c47bc61658f52a4489475237f805f85e000afe..c6aef508760a50fd8b7e19dc5f497d91d769b178 100644 (file)
--- a/extras/volume_id/volume_id/volume_id.h
+++ b/extras/volume_id/volume_id/volume_id.h
@@ -21,11 +21,10 @@
 #ifndef _VOLUME_ID_H_
 #define _VOLUME_ID_H_
 
-#define VOLUME_ID_VERSION              32
+#define VOLUME_ID_VERSION              45
 
 #define VOLUME_ID_LABEL_SIZE           64
-#define VOLUME_ID_UUID_SIZE            16
-#define VOLUME_ID_UUID_STRING_SIZE     37
+#define VOLUME_ID_UUID_SIZE            36
 #define VOLUME_ID_FORMAT_SIZE          32
 #define VOLUME_ID_PATH_MAX             256
 #define VOLUME_ID_PARTITIONS_MAX       256
@@ -38,6 +37,7 @@ enum volume_id_usage {
        VOLUME_ID_PARTITIONTABLE,
        VOLUME_ID_RAID,
        VOLUME_ID_DISKLABEL,
+       VOLUME_ID_CRYPTO,
 };
 
 struct volume_id_partition {
@@ -54,7 +54,8 @@ struct volume_id {
        unsigned int    label_raw_len;
        char            label[VOLUME_ID_LABEL_SIZE+1];
        unsigned char   uuid_raw[VOLUME_ID_UUID_SIZE];
-       char            uuid[VOLUME_ID_UUID_STRING_SIZE];
+       unsigned int    uuid_raw_len;
+       char            uuid[VOLUME_ID_UUID_SIZE+1];
        enum            volume_id_usage usage_id;
        char            *usage;
        char            *type;