volume_id: correct iso9660 high sierra header

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

diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c
index a6e378dd283d6792207bad5fa566d65ae12eb75e..03b2aa0819740d76e849e3d8e987c2c7a5e87ad3 100644 (file)
--- a/extras/volume_id/lib/hfs.c
+++ b/extras/volume_id/lib/hfs.c
@@ -36,7 +36,7 @@ struct hfs_finder_info{
        uint8_t         id[8];
 } PACKED;
 
-struct hfs_mdb {
+static struct hfs_mdb {
        uint8_t         signature[2];
        uint32_t        cr_date;
        uint32_t        ls_Mod;
@@ -104,7 +104,7 @@ struct hfsplus_fork {
        struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
 } PACKED;
 
-struct hfsplus_vol_header {
+static struct hfsplus_vol_header {
        uint8_t         signature[2];
        uint16_t        version;
        uint32_t        attributes;
@@ -137,7 +137,7 @@ struct hfsplus_vol_header {
 #define HFS_NODE_LEAF                  0xff
 #define HFSPLUS_POR_CNID               1
 
-int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off)
+int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size)
 {
        unsigned int blocksize;
        unsigned int cat_block;
@@ -160,7 +160,7 @@ int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off)
        struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
        const uint8_t *buf;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
        if (buf == NULL)