volume_id: remove deprecated functions and bump major version

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

diff --git a/extras/volume_id/lib/ddf_raid.c b/extras/volume_id/lib/ddf_raid.c
index 560e6bd603a55d8a4a27ef3e6ec93525a34cf9d8..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 */
@@ -33,19 +34,20 @@
 #define DDF_GUID_LENGTH                        24
 #define DDF_REV_LENGTH                 8
 
-static struct ddf_header {
+struct ddf_header {
        uint32_t        signature;
        uint32_t        crc;
        uint8_t         guid[DDF_GUID_LENGTH];
        uint8_t         ddf_rev[DDF_REV_LENGTH];
-} PACKED *ddf;
+} PACKED;
 
 int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
        uint64_t ddf_off = ((size / 0x200)-1) * 0x200;
        const uint8_t *buf;
+       struct ddf_header *ddf;
 
-       info("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx\n",
            (unsigned long long) off, (unsigned long long) size);
        if (size < 0x10000)
                return -1;