volume_id: provide a custom debug function

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

diff --git a/extras/volume_id/libvolume_id/hfs.c b/extras/volume_id/libvolume_id/hfs.c
index 27a8ac9999c05da7f4ae19dfed09a88477806099..a6e378dd283d6792207bad5fa566d65ae12eb75e 100644 (file)
--- a/extras/volume_id/libvolume_id/hfs.c
+++ b/extras/volume_id/libvolume_id/hfs.c
@@ -23,8 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
 #include "util.h"
 
 struct hfs_finder_info{
@@ -35,7 +34,7 @@ struct hfs_finder_info{
        uint32_t        reserved;
        uint32_t        osx_folder;
        uint8_t         id[8];
-} __attribute__((__packed__));
+} PACKED;
 
 struct hfs_mdb {
        uint8_t         signature[2];
@@ -65,7 +64,7 @@ struct hfs_mdb {
        uint8_t         embed_sig[2];
        uint16_t        embed_startblock;
        uint16_t        embed_blockcount;
-} __attribute__((__packed__)) *hfs;
+} PACKED *hfs;
 
 struct hfsplus_bnode_descriptor {
        uint32_t        next;
@@ -74,7 +73,7 @@ struct hfsplus_bnode_descriptor {
        uint8_t         height;
        uint16_t        num_recs;
        uint16_t        reserved;
-} __attribute__((__packed__));
+} PACKED;
 
 struct hfsplus_bheader_record {
        uint16_t        depth;
@@ -83,19 +82,19 @@ struct hfsplus_bheader_record {
        uint32_t        leaf_head;
        uint32_t        leaf_tail;
        uint16_t        node_size;
-} __attribute__((__packed__));
+} PACKED;
 
 struct hfsplus_catalog_key {
        uint16_t        key_len;
        uint32_t        parent_id;
        uint16_t        unicode_len;
        uint8_t         unicode[255 * 2];
-} __attribute__((__packed__));
+} PACKED;
 
 struct hfsplus_extent {
        uint32_t        start_block;
        uint32_t        block_count;
-} __attribute__((__packed__));
+} PACKED;
 
 #define HFSPLUS_EXTENT_COUNT           8
 struct hfsplus_fork {
@@ -103,7 +102,7 @@ struct hfsplus_fork {
        uint32_t        clump_size;
        uint32_t        total_blocks;
        struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
-} __attribute__((__packed__));
+} PACKED;
 
 struct hfsplus_vol_header {
        uint8_t         signature[2];
@@ -132,7 +131,7 @@ struct hfsplus_vol_header {
        struct hfsplus_fork cat_file;
        struct hfsplus_fork attr_file;
        struct hfsplus_fork start_file;
-} __attribute__((__packed__)) *hfsplus;
+} PACKED *hfsplus;
 
 #define HFS_SUPERBLOCK_OFFSET          0x400
 #define HFS_NODE_LEAF                  0xff