volume_id: remove partition table parsing code

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

diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/volume_id.h
index f2f3a0d0065d52e48144eb8bf09f08ce47bff44d..d370bae6c8f262dafbc0673062a14f58a3b75a6b 100644 (file)
--- a/extras/volume_id/libvolume_id/volume_id.h
+++ b/extras/volume_id/libvolume_id/volume_id.h
@@ -12,8 +12,13 @@
 #define _VOLUME_ID_H_
 
 #include <stdint.h>
+#include <stddef.h>
 
-#define VOLUME_ID_VERSION              53
+#define VOLUME_ID_VERSION              60
+
+#ifndef PACKED
+#define PACKED                         __attribute__((packed))
+#endif
 
 #define VOLUME_ID_LABEL_SIZE           64
 #define VOLUME_ID_UUID_SIZE            36
@@ -68,6 +73,8 @@ struct volume_id {
 extern struct volume_id *volume_id_open_fd(int fd);
 extern struct volume_id *volume_id_open_node(const char *path);
 extern int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size);
 extern void volume_id_close(struct volume_id *id);
 
 /* filesystems */
@@ -89,6 +96,7 @@ extern int volume_id_probe_udf(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off);
 
 /* special formats */
 extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off);
@@ -109,8 +117,4 @@ extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t
 extern int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size);
 extern int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size);
 
-/* partition tables */
-extern int volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off);
-extern int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off);
-
 #endif