[PATCH] udev_volume_id: new version of volume_id

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

diff --git a/extras/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h
similarity index 70%
rename from extras/volume_id/volume_id.h
rename to extras/volume_id/volume_id/volume_id.h
index 9d66b196b7b41424c54fd40346c1c8388f4e9831..6c25a243c3fde2c1071a5151429e2c1cb4139b2e 100644 (file)
--- a/extras/volume_id/volume_id.h
+++ b/extras/volume_id/volume_id/volume_id.h
@@ -1,7 +1,7 @@
 /*
  * volume_id - reads partition label and uuid
  *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This library is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 #ifndef _VOLUME_ID_H_
 #define _VOLUME_ID_H_
 
-#define VOLUME_ID_VERSION              28
+#define VOLUME_ID_VERSION              31
 
 #define VOLUME_ID_LABEL_SIZE           64
 #define VOLUME_ID_UUID_SIZE            16
@@ -37,35 +37,12 @@ enum volume_id_usage {
        VOLUME_ID_FILESYSTEM,
        VOLUME_ID_PARTITIONTABLE,
        VOLUME_ID_RAID,
-};
-
-enum volume_id_type {
-       VOLUME_ID_ALL,
-       VOLUME_ID_MSDOSPARTTABLE,
-       VOLUME_ID_MSDOSEXTENDED,
-       VOLUME_ID_SWAP,
-       VOLUME_ID_EXT2,
-       VOLUME_ID_EXT3,
-       VOLUME_ID_REISERFS,
-       VOLUME_ID_XFS,
-       VOLUME_ID_JFS,
-       VOLUME_ID_VFAT,
-       VOLUME_ID_UDF,
-       VOLUME_ID_ISO9660,
-       VOLUME_ID_NTFS,
-       VOLUME_ID_MACPARTMAP,
-       VOLUME_ID_HFS,
-       VOLUME_ID_HFSPLUS,
-       VOLUME_ID_UFS,
-       VOLUME_ID_LINUX_RAID,
-       VOLUME_ID_LVM1,
-       VOLUME_ID_LVM2,
-       VOLUME_ID_HPTRAID,
+       VOLUME_ID_DISKLABEL,
 };
 
 struct volume_id_partition {
        enum            volume_id_usage usage_id;
-       enum            volume_id_type type_id;
+       char            *usage;
        char            *type;
        unsigned long long off;
        unsigned long long len;
@@ -79,11 +56,13 @@ struct volume_id {
        unsigned char   uuid_raw[VOLUME_ID_UUID_SIZE];
        char            uuid[VOLUME_ID_UUID_STRING_SIZE];
        enum            volume_id_usage usage_id;
-       enum            volume_id_type type_id;
+       char            *usage;
        char            *type;
        char            type_version[VOLUME_ID_FORMAT_SIZE];
+
        struct volume_id_partition *partitions;
        unsigned int    partition_count;
+
        int             fd;
        unsigned char   *sbbuf;
        unsigned int    sbbuf_len;
@@ -93,20 +72,10 @@ struct volume_id {
        int             fd_close;
 };
 
-/* open volume by already open file descriptor */
 extern struct volume_id *volume_id_open_fd(int fd);
-
-/* open volume by device node */
 extern struct volume_id *volume_id_open_node(const char *path);
-
-/* open volume by major/minor */
 extern struct volume_id *volume_id_open_dev_t(dev_t devt);
-
-/* probe volume for filesystem type and try to read label/uuid */
-extern int volume_id_probe(struct volume_id *id, enum volume_id_type type,
-                          unsigned long long off, unsigned long long size);
-
-/* free allocated device info */
+extern int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned long long size);
 extern void volume_id_close(struct volume_id *id);
 
 #endif