[PATCH] udev_volume_id: volume_id version 034

[elogind.git] / extras / volume_id / volume_id / mac / mac.c

diff --git a/extras/volume_id/volume_id/mac/mac.c b/extras/volume_id/volume_id/mac/mac.c
index 5872b722b45d7e127a1858d52a5250caf0e36370..895316d26c64408e24494c615651785084775783 100644 (file)
--- a/extras/volume_id/volume_id/mac/mac.c
+++ b/extras/volume_id/volume_id/mac/mac.c
@@ -39,25 +39,29 @@
 #include "../util.h"
 #include "mac.h"
 
+struct mac_driver_desc {
+       __u8    signature[2];
+       __u16   block_size;
+       __u32   block_count;
+} __attribute__((__packed__));
+
+struct mac_partition {
+       __u8    signature[2];
+       __u16   res1;
+       __u32   map_count;
+       __u32   start_block;
+       __u32   block_count;
+       __u8    name[32];
+       __u8    type[32];
+} __attribute__((__packed__));
+
 int volume_id_probe_mac_partition_map(struct volume_id *id, __u64 off)
 {
-       struct mac_driver_desc {
-               __u8    signature[2];
-               __u16   block_size;
-               __u32   block_count;
-       } __attribute__((__packed__)) *driver;
-
-       struct mac_partition {
-               __u8    signature[2];
-               __u16   res1;
-               __u32   map_count;
-               __u32   start_block;
-               __u32   block_count;
-               __u8    name[32];
-               __u8    type[32];
-       } __attribute__((__packed__)) *part;
-
        const __u8 *buf;
+       struct mac_driver_desc *driver;
+       struct mac_partition *part;
+
+       dbg("probing at offset %llu", off);
 
        buf = volume_id_get_buffer(id, off, 0x200);
        if (buf == NULL)