volume_id: remove deprecated functions and bump major version

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

diff --git a/extras/volume_id/lib/udf.c b/extras/volume_id/lib/udf.c
index d71e9d6f5d07fe15ef09396bb75208692321c8f5..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 {
@@ -61,7 +62,7 @@ struct volume_structure_descriptor {
 
 #define UDF_VSD_OFFSET                 0x8000
 
-int volume_id_probe_udf(struct volume_id *id, uint64_t off)
+int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size)
 {
        struct volume_descriptor *vd;
        struct volume_structure_descriptor *vsd;
@@ -72,7 +73,7 @@ int volume_id_probe_udf(struct volume_id *id, uint64_t off)
        unsigned int loc;
        unsigned int clen;
 
-       info("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx\n", (unsigned long long) off);
 
        vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET, 0x200);
        if (vsd == NULL)
@@ -100,7 +101,7 @@ blocksize:
                vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET + bs, 0x800);
                if (vsd == NULL)
                        return -1;
-               dbg("test for blocksize: 0x%x", bs);
+               dbg("test for blocksize: 0x%x\n", bs);
                if (vsd->id[0] != '\0')
                        goto nsr;
        }
@@ -113,7 +114,7 @@ nsr:
                if (vsd == NULL)
                        return -1;
 
-               dbg("vsd: %c%c%c%c%c",
+               dbg("vsd: %c%c%c%c%c\n",
                    vsd->id[0], vsd->id[1], vsd->id[2], vsd->id[3], vsd->id[4]);
 
                if (vsd->id[0] == '\0')
@@ -138,7 +139,7 @@ anchor:
        /* get desriptor list address and block count */
        count = le32_to_cpu(vd->type.anchor.length) / bs;
        loc = le32_to_cpu(vd->type.anchor.location);
-       dbg("0x%x descriptors starting at logical secor 0x%x", count, loc);
+       dbg("0x%x descriptors starting at logical secor 0x%x\n", count, loc);
 
        /* pick the primary descriptor from the list */
        for (b = 0; b < count; b++) {
@@ -147,7 +148,7 @@ anchor:
                        return -1;
 
                type = le16_to_cpu(vd->tag.id);
-               dbg("descriptor type %i", type);
+               dbg("descriptor type %i\n", type);
 
                /* check validity */
                if (type == 0)
@@ -164,7 +165,7 @@ pvd:
        volume_id_set_label_raw(id, &(vd->type.primary.ident.clen), 32);
 
        clen = vd->type.primary.ident.clen;
-       dbg("label string charsize=%i bit", clen);
+       dbg("label string charsize=%i bit\n", clen);
        if (clen == 8)
                volume_id_set_label_string(id, vd->type.primary.ident.c, 31);
        else if (clen == 16)