volume_id: remove deprecated functions and bump major version

diff --git a/configure.ac b/configure.ac
index 4be3ed583a82dea65b6aa16c248116c761236a33..a98d903c21fde15dbad58da93d04a6a2c22649aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,8 @@ AC_SUBST(LIBUDEV_LT_REVISION)
 AC_SUBST(LIBUDEV_LT_AGE)
 
 dnl /* libvolume_id version */
-VOLID_LT_CURRENT=0
-VOLID_LT_REVISION=86
+VOLID_LT_CURRENT=1
+VOLID_LT_REVISION=0
 VOLID_LT_AGE=0
 AC_SUBST(VOLID_LT_CURRENT)
 AC_SUBST(VOLID_LT_REVISION)

diff --git a/extras/volume_id/lib/Makefile.am b/extras/volume_id/lib/Makefile.am
index 6313962e68bbb5171c2cfaf0603b5b4f735b4469..f9c6fbe3069260c2e0e2aec25fa349e19a499868 100644 (file)
--- a/extras/volume_id/lib/Makefile.am
+++ b/extras/volume_id/lib/Makefile.am
@@ -6,6 +6,7 @@ include_HEADERS =\
        libvolume_id.h
 
 libvolume_id_la_SOURCES =\
+       libvolume_id-private.h \
        ext.c \
        fat.c \
        hfs.c \

diff --git a/extras/volume_id/lib/adaptec_raid.c b/extras/volume_id/lib/adaptec_raid.c
index 5ab9451890718c4e233305ff43d6cb9cfb3f0746..45a56dcfbdde9f7dbc657aa2df3ca735aca14d4c 100644 (file)
--- a/extras/volume_id/lib/adaptec_raid.c
+++ b/extras/volume_id/lib/adaptec_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct adaptec_meta {

diff --git a/extras/volume_id/lib/cramfs.c b/extras/volume_id/lib/cramfs.c
index 9c7eaf61779ae4de792902b88af2d5e77a6614a1..afbdf886d0920a205aea5e7c41c25cf7a0b72e84 100644 (file)
--- a/extras/volume_id/lib/cramfs.c
+++ b/extras/volume_id/lib/cramfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct cramfs_super {

diff --git a/extras/volume_id/lib/ddf_raid.c b/extras/volume_id/lib/ddf_raid.c
index 2e83c0809852d2129ce98258384a0b5f2a207094..de7b7a7b6367f783bf8f49c5338b7d4163140c33 100644 (file)
--- a/extras/volume_id/lib/ddf_raid.c
+++ b/extras/volume_id/lib/ddf_raid.c
@@ -25,6 +25,7 @@
 #include <byteswap.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 /* http://www.snia.org/standards/home */

diff --git a/extras/volume_id/lib/exported_symbols b/extras/volume_id/lib/exported_symbols
index 55b0265825202b5d4199d8b684da10dfab6d2250..d3b925c683031ed5cd94f01bb14fda4dd1236b3c 100644 (file)
--- a/extras/volume_id/lib/exported_symbols
+++ b/extras/volume_id/lib/exported_symbols
@@ -14,42 +14,3 @@ volume_id_probe_raid
 volume_id_all_probers
 volume_id_get_prober_by_type
 volume_id_encode_string
-volume_id_open_node
-volume_id_probe_linux_swap
-volume_id_probe_luks
-volume_id_probe_cramfs
-volume_id_probe_ext
-volume_id_probe_vfat
-volume_id_probe_hfs_hfsplus
-volume_id_probe_hpfs
-volume_id_probe_iso9660
-volume_id_probe_jfs
-volume_id_probe_minix
-volume_id_probe_ntfs
-volume_id_probe_ocfs1
-volume_id_probe_ocfs2
-volume_id_probe_reiserfs
-volume_id_probe_romfs
-volume_id_probe_sysv
-volume_id_probe_udf
-volume_id_probe_ufs
-volume_id_probe_vxfs
-volume_id_probe_xfs
-volume_id_probe_squashfs
-volume_id_probe_netware
-volume_id_probe_gfs
-volume_id_probe_gfs2
-volume_id_probe_linux_raid
-volume_id_probe_lvm1
-volume_id_probe_lvm2
-volume_id_probe_ddf_raid
-volume_id_probe_intel_software_raid
-volume_id_probe_highpoint_37x_raid
-volume_id_probe_highpoint_45x_raid
-volume_id_probe_lsi_mega_raid
-volume_id_probe_nvidia_raid
-volume_id_probe_promise_fasttrack_raid
-volume_id_probe_silicon_medley_raid
-volume_id_probe_via_raid
-volume_id_probe_adaptec_raid
-volume_id_probe_jmicron_raid

diff --git a/extras/volume_id/lib/ext.c b/extras/volume_id/lib/ext.c
index 56edd2531f01787da0f57c9074e49196a1bad687..49b7c5d0603efc4082ef7cb578987beba2c86943 100644 (file)
--- a/extras/volume_id/lib/ext.c
+++ b/extras/volume_id/lib/ext.c
@@ -27,6 +27,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct ext2_super_block {

diff --git a/extras/volume_id/lib/fat.c b/extras/volume_id/lib/fat.c
index 58f8f825c43a744217d707278c7fab6bfa7a148d..759e106f6805c9d6399c64804f3df7badc4e56ac 100644 (file)
--- a/extras/volume_id/lib/fat.c
+++ b/extras/volume_id/lib/fat.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define FAT12_MAX                      0xff5

diff --git a/extras/volume_id/lib/gfs.c b/extras/volume_id/lib/gfs.c
index 2cb16a8693a606387890803e6dce24dc724314f6..e1293ebce724f01e826d75faccd88c32ad42cf39 100644 (file)
--- a/extras/volume_id/lib/gfs.c
+++ b/extras/volume_id/lib/gfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 /* Common gfs/gfs2 constants: */

diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c
index b6d7e0290bc5cd760c2ba2893f1723d1665edc80..f8a4baf8fb1855632f02f763f6aae544bf68fb01 100644 (file)
--- a/extras/volume_id/lib/hfs.c
+++ b/extras/volume_id/lib/hfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct hfs_finder_info{

diff --git a/extras/volume_id/lib/highpoint.c b/extras/volume_id/lib/highpoint.c
index 06290151179667e65cfe755bd85016e95aad474a..23e25bcca153f785f081c21697d6e826d34d7246 100644 (file)
--- a/extras/volume_id/lib/highpoint.c
+++ b/extras/volume_id/lib/highpoint.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct hpt37x_meta {

diff --git a/extras/volume_id/lib/hpfs.c b/extras/volume_id/lib/hpfs.c
index ac5a35437a7494c78cc2b14612c69a744838b847..a95e778e5eacab4d4e9897b74abba393e2a88c2a 100644 (file)
--- a/extras/volume_id/lib/hpfs.c
+++ b/extras/volume_id/lib/hpfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct hpfs_super

diff --git a/extras/volume_id/lib/iso9660.c b/extras/volume_id/lib/iso9660.c
index 0e2c686fa20f143cf06761dcb6177619f32afe5a..367deee4d613d22b0d6fec869b8e0c135c4f6755 100644 (file)
--- a/extras/volume_id/lib/iso9660.c
+++ b/extras/volume_id/lib/iso9660.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define ISO_SUPERBLOCK_OFFSET          0x8000

diff --git a/extras/volume_id/lib/isw_raid.c b/extras/volume_id/lib/isw_raid.c
index 337a9cecbd624459ba7aa4fea5aea7c403c4c316..f62d106f536f7ed791ce898d9f20cff1759568f0 100644 (file)
--- a/extras/volume_id/lib/isw_raid.c
+++ b/extras/volume_id/lib/isw_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct isw_meta {

diff --git a/extras/volume_id/lib/jfs.c b/extras/volume_id/lib/jfs.c
index 950ba43e1c5278ef0ed2b45575be2db8191bac4a..d4a5f0febb594550ad3d494a365e24e6f44d4787 100644 (file)
--- a/extras/volume_id/lib/jfs.c
+++ b/extras/volume_id/lib/jfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct jfs_super_block {

diff --git a/extras/volume_id/lib/jmicron_raid.c b/extras/volume_id/lib/jmicron_raid.c
index 6cb1f6f315d57b55f929687baaa43dee43f02f9e..2279c4df5cf68f7feb382e720c69e229280fd390 100644 (file)
--- a/extras/volume_id/lib/jmicron_raid.c
+++ b/extras/volume_id/lib/jmicron_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct jmicron_meta {

diff --git a/extras/volume_id/lib/libvolume_id-private.h b/extras/volume_id/lib/libvolume_id-private.h
new file mode 100644 (file)
index 0000000..578f6fc
--- /dev/null
+++ b/extras/volume_id/lib/libvolume_id-private.h
@@ -0,0 +1,103 @@
+/*
+ * volume_id - reads volume label and uuid
+ *
+ * Copyright (C) 2005-2007 Kay Sievers <kay.sievers@vrfy.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
+ */
+
+#ifndef _LIBVOLUME_ID_PRIVATE_H_
+#define _LIBVOLUME_ID_PRIVATE_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include "libvolume_id.h"
+
+#define VOLUME_ID_LABEL_SIZE           64
+#define VOLUME_ID_UUID_SIZE            36
+#define VOLUME_ID_FORMAT_SIZE          32
+#define VOLUME_ID_PATH_MAX             256
+#define VOLUME_ID_PARTITIONS_MAX       256
+
+enum volume_id_usage {
+       VOLUME_ID_UNUSED,
+       VOLUME_ID_UNPROBED,
+       VOLUME_ID_OTHER,
+       VOLUME_ID_FILESYSTEM,
+       VOLUME_ID_RAID,
+       VOLUME_ID_DISKLABEL,
+       VOLUME_ID_CRYPTO,
+};
+
+struct volume_id {
+       uint8_t         label_raw[VOLUME_ID_LABEL_SIZE];
+       size_t          label_raw_len;
+       char            label[VOLUME_ID_LABEL_SIZE+1];
+       uint8_t         uuid_raw[VOLUME_ID_UUID_SIZE];
+       size_t          uuid_raw_len;
+       char            uuid[VOLUME_ID_UUID_SIZE+1];
+       enum            volume_id_usage usage_id;
+       char            *usage;
+       char            *type;
+       char            type_version[VOLUME_ID_FORMAT_SIZE];
+
+       int             fd;
+       uint8_t         *sbbuf;
+       size_t          sbbuf_len;
+       uint8_t         *seekbuf;
+       uint64_t        seekbuf_off;
+       size_t          seekbuf_len;
+       int             fd_close:1;
+};
+
+/* filesystems */
+extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_gfs(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_gfs2(struct volume_id *id, uint64_t off, uint64_t size);
+
+/* special formats */
+extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_luks(struct volume_id *id, uint64_t off, uint64_t size);
+
+/* raid */
+extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size);
+
+/* bios raid */
+extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
+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);
+extern int volume_id_probe_adaptec_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_jmicron_raid(struct volume_id *id, uint64_t off, uint64_t size);
+
+#endif

diff --git a/extras/volume_id/lib/libvolume_id.h b/extras/volume_id/lib/libvolume_id.h
index 6cce6e377d492003cdc3aeffef8fe9d1691558a0..d1a0077f0c4b35454a8dcc32a16ca0113262071d 100644 (file)
--- a/extras/volume_id/lib/libvolume_id.h
+++ b/extras/volume_id/lib/libvolume_id.h
@@ -1,7 +1,7 @@
 /*
  * volume_id - reads volume label and uuid
  *
- * Copyright (C) 2005-2007 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -14,11 +14,11 @@
 #include <stdint.h>
 #include <stddef.h>
 
+struct volume_id;
 typedef void (*volume_id_log_fn_t)(int priority, const char *file, int line, const char *format, ...)
             __attribute__ ((format(printf, 4, 5)));
 extern volume_id_log_fn_t volume_id_log_fn;
 
-struct volume_id;
 typedef int (*volume_id_probe_fn_t)(struct volume_id *id, uint64_t off, uint64_t size);
 typedef int (*all_probers_fn_t)(volume_id_probe_fn_t probe_fn,
                                struct volume_id *id, uint64_t off, uint64_t size,
@@ -42,95 +42,4 @@ extern int volume_id_get_type(struct volume_id *id, const char **type);
 extern int volume_id_get_type_version(struct volume_id *id, const char **type_version);
 extern int volume_id_encode_string(const char *str, char *str_enc, size_t len);
 
-/*
- * Note: everything below will be made private or removed from
- * a future version, and a new major release of libvolume_id
- */
-
-extern struct volume_id *volume_id_open_node(const char *path);
-
-#define VOLUME_ID_LABEL_SIZE           64
-#define VOLUME_ID_UUID_SIZE            36
-#define VOLUME_ID_FORMAT_SIZE          32
-#define VOLUME_ID_PATH_MAX             256
-#define VOLUME_ID_PARTITIONS_MAX       256
-
-enum volume_id_usage {
-       VOLUME_ID_UNUSED,
-       VOLUME_ID_UNPROBED,
-       VOLUME_ID_OTHER,
-       VOLUME_ID_FILESYSTEM,
-       VOLUME_ID_RAID,
-       VOLUME_ID_DISKLABEL,
-       VOLUME_ID_CRYPTO,
-};
-
-struct volume_id {
-       uint8_t         label_raw[VOLUME_ID_LABEL_SIZE];
-       size_t          label_raw_len;
-       char            label[VOLUME_ID_LABEL_SIZE+1];
-       uint8_t         uuid_raw[VOLUME_ID_UUID_SIZE];
-       size_t          uuid_raw_len;
-       char            uuid[VOLUME_ID_UUID_SIZE+1];
-       enum            volume_id_usage usage_id;
-       char            *usage;
-       char            *type;
-       char            type_version[VOLUME_ID_FORMAT_SIZE];
-
-       int             fd;
-       uint8_t         *sbbuf;
-       size_t          sbbuf_len;
-       uint8_t         *seekbuf;
-       uint64_t        seekbuf_off;
-       size_t          seekbuf_len;
-       int             fd_close:1;
-};
-
-/* filesystems */
-extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_gfs(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_gfs2(struct volume_id *id, uint64_t off, uint64_t size);
-
-/* special formats */
-extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_luks(struct volume_id *id, uint64_t off, uint64_t size);
-
-/* raid */
-extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size);
-
-/* bios raid */
-extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
-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);
-extern int volume_id_probe_adaptec_raid(struct volume_id *id, uint64_t off, uint64_t size);
-extern int volume_id_probe_jmicron_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
 #endif

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index af496584c45cb06e3087816c20f661ef54a85904..5d95b502e37458bbc4efaaefe8a14ff1c404a411 100644 (file)
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -25,6 +25,7 @@
 #include <byteswap.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct mdp0_super_block {

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 592a38570d46d4852fcf4b4c93f4430676054723..13a0077f60c5a2e057ee10d2ef7da9603df2a8f5 100644 (file)
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct swap_header_v1_2 {

diff --git a/extras/volume_id/lib/lsi_raid.c b/extras/volume_id/lib/lsi_raid.c
index eef87142b83ccf3d02714ae263181f21d7a1e963..30ebe7b5e63b4f3df975b57c6268e6f95a3b89e4 100644 (file)
--- a/extras/volume_id/lib/lsi_raid.c
+++ b/extras/volume_id/lib/lsi_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct lsi_meta {

diff --git a/extras/volume_id/lib/luks.c b/extras/volume_id/lib/luks.c
index 20b50d0efdf937605e8d912814fc3c8d0bae465a..4fb97e3598cdcdfcb9246599aa02fe3d57fe9b79 100644 (file)
--- a/extras/volume_id/lib/luks.c
+++ b/extras/volume_id/lib/luks.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define SECTOR_SHIFT                   9

diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c
index d234113d7798c9ca72db764fdffcfb3318fd0a14..5dc360f65d8ce5f15cac1d4bc04b2e89c19b2e0e 100644 (file)
--- a/extras/volume_id/lib/lvm.c
+++ b/extras/volume_id/lib/lvm.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct lvm1_super_block {

diff --git a/extras/volume_id/lib/minix.c b/extras/volume_id/lib/minix.c
index 88b4c189c457f7d57a283c2a3b7f87f3c53a89de..41bdab2fe68200c73fac3309a39e1edb349fd4ac 100644 (file)
--- a/extras/volume_id/lib/minix.c
+++ b/extras/volume_id/lib/minix.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define MINIX_SUPERBLOCK_OFFSET                        0x400

diff --git a/extras/volume_id/lib/netware.c b/extras/volume_id/lib/netware.c
index c03455791c8b8817617d494a4b591752dbb521f0..249dbbf20d4465f698e1ab4fe5d2799c82df9268 100644 (file)
--- a/extras/volume_id/lib/netware.c
+++ b/extras/volume_id/lib/netware.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define NW_SUPERBLOCK_OFFSET                   0x1000

diff --git a/extras/volume_id/lib/ntfs.c b/extras/volume_id/lib/ntfs.c
index 1e73bc8f154cf9ccdd4e0d526186f1955d03f0b4..3d1e05798a4db58cd380f1f9b1fec99afe1774cc 100644 (file)
--- a/extras/volume_id/lib/ntfs.c
+++ b/extras/volume_id/lib/ntfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 static struct ntfs_super_block {

diff --git a/extras/volume_id/lib/nvidia_raid.c b/extras/volume_id/lib/nvidia_raid.c
index c6b518539957da49f94b9ff86e8f2bd31221e939..5af3724c4910a6c4a8a2d37303451f7eaf00988f 100644 (file)
--- a/extras/volume_id/lib/nvidia_raid.c
+++ b/extras/volume_id/lib/nvidia_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct nvidia_meta {

diff --git a/extras/volume_id/lib/ocfs.c b/extras/volume_id/lib/ocfs.c
index ec81f5e8e30d2adaf1d0bbfc37c2086f57c4ed36..d56a64ae5ecb55c94b09d460163bd6a78f45e9a6 100644 (file)
--- a/extras/volume_id/lib/ocfs.c
+++ b/extras/volume_id/lib/ocfs.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 

diff --git a/extras/volume_id/lib/oracleasm.c b/extras/volume_id/lib/oracleasm.c
index 0f5ff80cfb98ae7e47ff96a23ca8ed2fd0580621..9ea00e20cc9af40b658cb450335cf870ab1b0995 100644 (file)
--- a/extras/volume_id/lib/oracleasm.c
+++ b/extras/volume_id/lib/oracleasm.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct oracleasm_super_block {

diff --git a/extras/volume_id/lib/promise_raid.c b/extras/volume_id/lib/promise_raid.c
index ecaed0098630d8bafddbfa4c6754767ee8e9b954..09aaaf9665af409d48cc74e198fb94a7afe3822d 100644 (file)
--- a/extras/volume_id/lib/promise_raid.c
+++ b/extras/volume_id/lib/promise_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct promise_meta {

diff --git a/extras/volume_id/lib/reiserfs.c b/extras/volume_id/lib/reiserfs.c
index 0f30233eaf9460e1f19e34146bf954feb20ca7fd..188607b7c1c04a32342bf8dfa811711cdfc0213a 100644 (file)
--- a/extras/volume_id/lib/reiserfs.c
+++ b/extras/volume_id/lib/reiserfs.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct reiserfs_super_block {

diff --git a/extras/volume_id/lib/romfs.c b/extras/volume_id/lib/romfs.c
index 303a1fb40ec6d7972199ba1b1d6c9736e47822d9..01fbf81b798dd92bb79a534db8635e0b27e90d0a 100644 (file)
--- a/extras/volume_id/lib/romfs.c
+++ b/extras/volume_id/lib/romfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct romfs_super {

diff --git a/extras/volume_id/lib/silicon_raid.c b/extras/volume_id/lib/silicon_raid.c
index cfdcbcb868126c7b579d9e780b29a27df8e2449c..a0cda375e52fa86f3a905d4e3d51a9ff5435fa7f 100644 (file)
--- a/extras/volume_id/lib/silicon_raid.c
+++ b/extras/volume_id/lib/silicon_raid.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct silicon_meta {

diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c
index 18e44abcb4f28af2c003413bca5de05d4f0fe3b4..e39e1a12ee8c7d70274c704108ac57354fe32374 100644 (file)
--- a/extras/volume_id/lib/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define SQUASHFS_MAGIC         0x73717368

diff --git a/extras/volume_id/lib/sysv.c b/extras/volume_id/lib/sysv.c
index ba37c4d0a61988631197a03b9c2518c252552757..fe8efecd9b78541e2f9a9e7bc130f7aa08d295b1 100644 (file)
--- a/extras/volume_id/lib/sysv.c
+++ b/extras/volume_id/lib/sysv.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define SYSV_NICINOD                   100

diff --git a/extras/volume_id/lib/udf.c b/extras/volume_id/lib/udf.c
index 2a589c5f2a1c355fb24ba7d54625ed5923446796..b0865b2e8d230db2b9e437042ff276661c30cfb3 100644 (file)
--- a/extras/volume_id/lib/udf.c
+++ b/extras/volume_id/lib/udf.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct volume_descriptor {

diff --git a/extras/volume_id/lib/ufs.c b/extras/volume_id/lib/ufs.c
index bedcfa47da4e3adf063e4cce5f128936dd8b8b68..26c3df6d140c4c53d2eda0e15866db5ec7667321 100644 (file)
--- a/extras/volume_id/lib/ufs.c
+++ b/extras/volume_id/lib/ufs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct ufs_super_block {

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index 2a63efe8f7e2aa9793c3de8b361056306ef6fbee..ea07cfd6c1bc0b8794a26cb1b79fba74c2703bf8 100644 (file)
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 /* count of characters used to encode one unicode char */

diff --git a/extras/volume_id/lib/via_raid.c b/extras/volume_id/lib/via_raid.c
index 9965e13bc2e15278bc5923a67484ea8f2b7bc0e8..7e1ac26084a0d87eb85eaac54ac9cd79c8f88004 100644 (file)
--- a/extras/volume_id/lib/via_raid.c
+++ b/extras/volume_id/lib/via_raid.c
@@ -27,6 +27,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct via_meta {

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index b247fe2ddbc0211afd165a2f59ae1d108153743c..86e66bb76c80dc8f5eb9d7b70734abeb04bf42c0 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -489,27 +490,6 @@ struct volume_id *volume_id_open_fd(int fd)
        return id;
 }
 
-struct volume_id *volume_id_open_node(const char *path)
-{
-       struct volume_id *id;
-       int fd;
-
-       fd = open(path, O_RDONLY);
-       if (fd < 0) {
-               dbg("unable to open '%s'\n", path);
-               return NULL;
-       }
-
-       id = volume_id_open_fd(fd);
-       if (id == NULL)
-               return NULL;
-
-       /* close fd on device close */
-       id->fd_close = 1;
-
-       return id;
-}
-
 /**
  * volume_id_close:
  * @id: Probing context.

diff --git a/extras/volume_id/lib/vxfs.c b/extras/volume_id/lib/vxfs.c
index 33d357b7d85cbfd8e0d218c5685fccc196708045..5d319201137ab855c140ff386ee14bc8d939a06a 100644 (file)
--- a/extras/volume_id/lib/vxfs.c
+++ b/extras/volume_id/lib/vxfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 #define VXFS_SUPER_MAGIC       0xa501FCF5

diff --git a/extras/volume_id/lib/xfs.c b/extras/volume_id/lib/xfs.c
index 3e10560af9c6d34915c52c2da54cce747725f7ab..5b14f449fe5cf2d08dd30dd752e307993a803629 100644 (file)
--- a/extras/volume_id/lib/xfs.c
+++ b/extras/volume_id/lib/xfs.c
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
+#include "libvolume_id-private.h"
 #include "util.h"
 
 struct xfs_super_block {