aboutsummaryrefslogtreecommitdiff
path: root/util-linux/volume_id/hfs.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-09-16 00:58:11 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-09-16 00:58:11 +0200
commit8dc0e1929e3af3b1673e5a8e486808386400c020 (patch)
tree0550684999338af8f15de76c5599f9dead3fdfd6 /util-linux/volume_id/hfs.c
parentf2c184be835fbcbd04d06fce22783c6a5d37b563 (diff)
downloadbusybox-w32-8dc0e1929e3af3b1673e5a8e486808386400c020.tar.gz
busybox-w32-8dc0e1929e3af3b1673e5a8e486808386400c020.tar.bz2
busybox-w32-8dc0e1929e3af3b1673e5a8e486808386400c020.zip
use PACKED macro insted of open-coding GCC-ism
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/volume_id/hfs.c')
-rw-r--r--util-linux/volume_id/hfs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index f99b895c4..71a5e8b09 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -28,7 +28,7 @@ struct hfs_finder_info{
28 uint32_t reserved; 28 uint32_t reserved;
29 uint32_t osx_folder; 29 uint32_t osx_folder;
30 uint8_t id[8]; 30 uint8_t id[8];
31} __attribute__((__packed__)); 31} PACKED;
32 32
33struct hfs_mdb { 33struct hfs_mdb {
34 uint8_t signature[2]; 34 uint8_t signature[2];
@@ -58,7 +58,7 @@ struct hfs_mdb {
58 uint8_t embed_sig[2]; 58 uint8_t embed_sig[2];
59 uint16_t embed_startblock; 59 uint16_t embed_startblock;
60 uint16_t embed_blockcount; 60 uint16_t embed_blockcount;
61} __attribute__((__packed__)); 61} PACKED;
62 62
63struct hfsplus_bnode_descriptor { 63struct hfsplus_bnode_descriptor {
64 uint32_t next; 64 uint32_t next;
@@ -67,7 +67,7 @@ struct hfsplus_bnode_descriptor {
67 uint8_t height; 67 uint8_t height;
68 uint16_t num_recs; 68 uint16_t num_recs;
69 uint16_t reserved; 69 uint16_t reserved;
70} __attribute__((__packed__)); 70} PACKED;
71 71
72struct hfsplus_bheader_record { 72struct hfsplus_bheader_record {
73 uint16_t depth; 73 uint16_t depth;
@@ -76,19 +76,19 @@ struct hfsplus_bheader_record {
76 uint32_t leaf_head; 76 uint32_t leaf_head;
77 uint32_t leaf_tail; 77 uint32_t leaf_tail;
78 uint16_t node_size; 78 uint16_t node_size;
79} __attribute__((__packed__)); 79} PACKED;
80 80
81struct hfsplus_catalog_key { 81struct hfsplus_catalog_key {
82 uint16_t key_len; 82 uint16_t key_len;
83 uint32_t parent_id; 83 uint32_t parent_id;
84 uint16_t unicode_len; 84 uint16_t unicode_len;
85 uint8_t unicode[255 * 2]; 85 uint8_t unicode[255 * 2];
86} __attribute__((__packed__)); 86} PACKED;
87 87
88struct hfsplus_extent { 88struct hfsplus_extent {
89 uint32_t start_block; 89 uint32_t start_block;
90 uint32_t block_count; 90 uint32_t block_count;
91} __attribute__((__packed__)); 91} PACKED;
92 92
93#define HFSPLUS_EXTENT_COUNT 8 93#define HFSPLUS_EXTENT_COUNT 8
94struct hfsplus_fork { 94struct hfsplus_fork {
@@ -96,7 +96,7 @@ struct hfsplus_fork {
96 uint32_t clump_size; 96 uint32_t clump_size;
97 uint32_t total_blocks; 97 uint32_t total_blocks;
98 struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT]; 98 struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
99} __attribute__((__packed__)); 99} PACKED;
100 100
101struct hfsplus_vol_header { 101struct hfsplus_vol_header {
102 uint8_t signature[2]; 102 uint8_t signature[2];
@@ -125,7 +125,7 @@ struct hfsplus_vol_header {
125 struct hfsplus_fork cat_file; 125 struct hfsplus_fork cat_file;
126 struct hfsplus_fork attr_file; 126 struct hfsplus_fork attr_file;
127 struct hfsplus_fork start_file; 127 struct hfsplus_fork start_file;
128} __attribute__((__packed__)); 128} PACKED;
129 129
130#define HFS_SUPERBLOCK_OFFSET 0x400 130#define HFS_SUPERBLOCK_OFFSET 0x400
131#define HFS_NODE_LEAF 0xff 131#define HFS_NODE_LEAF 0xff