Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/volume_id/volume_id_internal.h

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/volume_id/volume_id_internal.h (modified) (4 diffs)

branches/3.2/mindi-busybox/util-linux/volume_id/volume_id_internal.h

@@ -81 +81 @@
 //  smallint    usage_id;
 //  const char  *usage;
-//  const char  *type;
+#if ENABLE_FEATURE_BLKID_TYPE
+    const char  *type;
+#endif
 };
 
@@ -135 +137 @@
 #endif
 
+/* volume_id_set_uuid(id,buf,fmt) assumes size of uuid buf
+ * by shifting: 4 << fmt, except for fmt == UUID_DCE_STRING.
+ * The constants below should match sizes.
+ */
 enum uuid_format {
-    UUID_DCE_STRING,
-    UUID_DCE,
-    UUID_DOS,
-    UUID_NTFS,
-    UUID_HFS,
+    UUID_DOS = 0,       /* 4 bytes */
+    UUID_NTFS = 1,      /* 8 bytes */
+    UUID_DCE = 2,       /* 16 bytes */
+    UUID_DCE_STRING = 3,    /* 36 bytes (VOLUME_ID_UUID_SIZE) */
 };
 
@@ -211 +216 @@
 //int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_exfat(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id /*,uint64_t off*/);
 
@@ -219 +228 @@
 int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_squashfs(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_sysv(struct volume_id *id /*,uint64_t off*/);