volume_id: escape % character

[elogind.git] / extras / volume_id / lib / ext.c

diff --git a/extras/volume_id/lib/ext.c b/extras/volume_id/lib/ext.c
index 7d41a3287e0e2935c04f938efbb66ade78fb9ce6..e5f1e22f6e8d754b1e80c848c77ed6b6e0652532 100644 (file)
--- a/extras/volume_id/lib/ext.c
+++ b/extras/volume_id/lib/ext.c
@@ -70,7 +70,7 @@ struct ext2_super_block {
 #define EXT3_MIN_BLOCK_SIZE                    0x400
 #define EXT3_MAX_BLOCK_SIZE                    0x1000
 
-int volume_id_probe_ext(struct volume_id *id, uint64_t off)
+int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size)
 {
        struct ext2_super_block *es;
        size_t bsize;
@@ -93,9 +93,9 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off)
 
        volume_id_set_label_raw(id, es->s_volume_name, 16);
        volume_id_set_label_string(id, es->s_volume_name, 16);
-       volume_id_set_uuid(id, es->s_uuid, UUID_DCE);
-       snprintf(id->type_version, sizeof(id->type_version)-1,
-                "%u.%u", es->s_rev_level, es->s_minor_rev_level);
+       volume_id_set_uuid(id, es->s_uuid, 0, UUID_DCE);
+       snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u",
+                le32_to_cpu(es->s_rev_level), le16_to_cpu(es->s_minor_rev_level));
 
        /* check for external journal device */
        if ((le32_to_cpu(es->s_feature_incompat) & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) != 0) {