diff options
Diffstat (limited to 'extras')
30 files changed, 72 insertions, 68 deletions
diff --git a/extras/volume_id/libvolume_id/cramfs.c b/extras/volume_id/libvolume_id/cramfs.c index bf79407d9d..e099c214c8 100644 --- a/extras/volume_id/libvolume_id/cramfs.c +++ b/extras/volume_id/libvolume_id/cramfs.c @@ -38,9 +38,9 @@ struct cramfs_super { uint32_t edition; uint32_t blocks; uint32_t files; - } __attribute__((__packed__)) info; + } PACKED info; uint8_t name[16]; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_cramfs(struct volume_id *id, uint64_t off) { diff --git a/extras/volume_id/libvolume_id/ext.c b/extras/volume_id/libvolume_id/ext.c index d1f62dfb6f..26ac98bc37 100644 --- a/extras/volume_id/libvolume_id/ext.c +++ b/extras/volume_id/libvolume_id/ext.c @@ -61,7 +61,7 @@ struct ext2_super_block { uint32_t s_feature_ro_compat; uint8_t s_uuid[16]; uint8_t s_volume_name[16]; -} __attribute__((__packed__)); +} PACKED; #define EXT_SUPER_MAGIC 0xEF53 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x00000004 diff --git a/extras/volume_id/libvolume_id/fat.c b/extras/volume_id/libvolume_id/fat.c index cea5b8cff2..a72ec19f59 100644 --- a/extras/volume_id/libvolume_id/fat.c +++ b/extras/volume_id/libvolume_id/fat.c @@ -58,7 +58,7 @@ struct vfat_super_block { uint8_t magic[8]; uint8_t dummy2[192]; uint8_t pmagic[2]; - } __attribute__((__packed__)) fat; + } PACKED fat; struct fat32_super_block { uint32_t fat32_length; uint16_t flags; @@ -73,9 +73,9 @@ struct vfat_super_block { uint8_t magic[8]; uint8_t dummy2[164]; uint8_t pmagic[2]; - } __attribute__((__packed__)) fat32; - } __attribute__((__packed__)) type; -} __attribute__((__packed__)); + } PACKED fat32; + } PACKED type; +} PACKED; struct vfat_dir_entry { uint8_t name[11]; @@ -89,7 +89,7 @@ struct vfat_dir_entry { uint16_t date_write; uint16_t cluster_low; uint32_t size; -} __attribute__((__packed__)); +} PACKED; static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, unsigned int count) { diff --git a/extras/volume_id/libvolume_id/hfs.c b/extras/volume_id/libvolume_id/hfs.c index 27a8ac9999..09194d5be1 100644 --- a/extras/volume_id/libvolume_id/hfs.c +++ b/extras/volume_id/libvolume_id/hfs.c @@ -35,7 +35,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 +65,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 +74,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 +83,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 +103,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 +132,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 diff --git a/extras/volume_id/libvolume_id/highpoint.c b/extras/volume_id/libvolume_id/highpoint.c index 721b7ab26f..78a4ad82b4 100644 --- a/extras/volume_id/libvolume_id/highpoint.c +++ b/extras/volume_id/libvolume_id/highpoint.c @@ -30,11 +30,11 @@ struct hpt37x_meta { uint8_t filler1[32]; uint32_t magic; -} __attribute__((packed)); +} PACKED; struct hpt45x_meta { uint32_t magic; -} __attribute__((packed)); +} PACKED; #define HPT37X_CONFIG_OFF 0x1200 #define HPT37X_MAGIC_OK 0x5a7816f0 diff --git a/extras/volume_id/libvolume_id/hpfs.c b/extras/volume_id/libvolume_id/hpfs.c index 52cb47be39..452df0124d 100644 --- a/extras/volume_id/libvolume_id/hpfs.c +++ b/extras/volume_id/libvolume_id/hpfs.c @@ -31,7 +31,7 @@ struct hpfs_super { uint8_t magic[4]; uint8_t version; -} __attribute__((__packed__)); +} PACKED; #define HPFS_SUPERBLOCK_OFFSET 0x2000 diff --git a/extras/volume_id/libvolume_id/iso9660.c b/extras/volume_id/libvolume_id/iso9660.c index b6654cecf2..2e28af8d70 100644 --- a/extras/volume_id/libvolume_id/iso9660.c +++ b/extras/volume_id/libvolume_id/iso9660.c @@ -45,14 +45,14 @@ struct iso_volume_descriptor { uint8_t unused[8]; uint8_t space_size[8]; uint8_t escape_sequences[8]; -} __attribute__((__packed__)); +} PACKED; struct high_sierra_volume_descriptor { uint8_t foo[8]; uint8_t type; uint8_t id[4]; uint8_t version; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_iso9660(struct volume_id *id, uint64_t off) { diff --git a/extras/volume_id/libvolume_id/isw_raid.c b/extras/volume_id/libvolume_id/isw_raid.c index 1f49959ff9..72b2b85b12 100644 --- a/extras/volume_id/libvolume_id/isw_raid.c +++ b/extras/volume_id/libvolume_id/isw_raid.c @@ -33,7 +33,7 @@ struct isw_meta { uint32_t mpb_size; uint32_t family_num; uint32_t generation_num; -} __attribute__((packed)); +} PACKED; #define ISW_SIGNATURE "Intel Raid ISM Cfg Sig. " diff --git a/extras/volume_id/libvolume_id/jfs.c b/extras/volume_id/libvolume_id/jfs.c index b6ae9624d6..78b61fb30d 100644 --- a/extras/volume_id/libvolume_id/jfs.c +++ b/extras/volume_id/libvolume_id/jfs.c @@ -38,7 +38,7 @@ struct jfs_super_block { uint8_t uuid[16]; uint8_t label[16]; uint8_t loguuid[16]; -} __attribute__((__packed__)); +} PACKED; #define JFS_SUPERBLOCK_OFFSET 0x8000 diff --git a/extras/volume_id/libvolume_id/linux_raid.c b/extras/volume_id/libvolume_id/linux_raid.c index d90510a817..2285e87b97 100644 --- a/extras/volume_id/libvolume_id/linux_raid.c +++ b/extras/volume_id/libvolume_id/linux_raid.c @@ -44,7 +44,7 @@ struct mdp_super_block { uint32_t set_uuid1; uint32_t set_uuid2; uint32_t set_uuid3; -} __attribute__((packed)) *mdp; +} PACKED *mdp; #define MD_RESERVED_BYTES 0x10000 #define MD_MAGIC 0xa92b4efc diff --git a/extras/volume_id/libvolume_id/linux_swap.c b/extras/volume_id/libvolume_id/linux_swap.c index 18928b8351..b4828347f7 100644 --- a/extras/volume_id/libvolume_id/linux_swap.c +++ b/extras/volume_id/libvolume_id/linux_swap.c @@ -34,7 +34,7 @@ struct swap_header_v1_2 { uint32_t nr_badpages; uint8_t uuid[16]; uint8_t volume_name[16]; -} __attribute__((__packed__)) *sw; +} PACKED *sw; #define LARGEST_PAGESIZE 0x4000 diff --git a/extras/volume_id/libvolume_id/lsi_raid.c b/extras/volume_id/libvolume_id/lsi_raid.c index 2720de763d..efa792575f 100644 --- a/extras/volume_id/libvolume_id/lsi_raid.c +++ b/extras/volume_id/libvolume_id/lsi_raid.c @@ -29,7 +29,7 @@ struct lsi_meta { uint8_t sig[6]; -} __attribute__((packed)); +} PACKED; #define LSI_SIGNATURE "$XIDE$" diff --git a/extras/volume_id/libvolume_id/lvm.c b/extras/volume_id/libvolume_id/lvm.c index 650986256d..074660b1e4 100644 --- a/extras/volume_id/libvolume_id/lvm.c +++ b/extras/volume_id/libvolume_id/lvm.c @@ -29,7 +29,7 @@ struct lvm1_super_block { uint8_t id[2]; -} __attribute__((packed)); +} PACKED; struct lvm2_super_block { uint8_t id[8]; @@ -37,7 +37,7 @@ struct lvm2_super_block { uint32_t crc_xl; uint32_t offset_xl; uint8_t type[8]; -} __attribute__((packed)); +} PACKED; #define LVM1_SB_OFF 0x400 #define LVM1_MAGIC "HM" diff --git a/extras/volume_id/libvolume_id/mac.c b/extras/volume_id/libvolume_id/mac.c index 53f0761c8a..78ef9fc803 100644 --- a/extras/volume_id/libvolume_id/mac.c +++ b/extras/volume_id/libvolume_id/mac.c @@ -31,7 +31,7 @@ struct mac_driver_desc { uint8_t signature[2]; uint16_t block_size; uint32_t block_count; -} __attribute__((__packed__)); +} PACKED; struct mac_partition { uint8_t signature[2]; @@ -41,7 +41,7 @@ struct mac_partition { uint32_t block_count; uint8_t name[32]; uint8_t type[32]; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off) { diff --git a/extras/volume_id/libvolume_id/minix.c b/extras/volume_id/libvolume_id/minix.c index ca57745f78..fefba8e729 100644 --- a/extras/volume_id/libvolume_id/minix.c +++ b/extras/volume_id/libvolume_id/minix.c @@ -39,7 +39,7 @@ struct minix_super_block uint16_t s_magic; uint16_t s_state; uint32_t s_zones; -} __attribute__((__packed__)); +} PACKED; #define MINIX_SUPERBLOCK_OFFSET 0x400 diff --git a/extras/volume_id/libvolume_id/msdos.c b/extras/volume_id/libvolume_id/msdos.c index a66046052a..ca3801a8db 100644 --- a/extras/volume_id/libvolume_id/msdos.c +++ b/extras/volume_id/libvolume_id/msdos.c @@ -38,7 +38,7 @@ struct msdos_partition_entry { uint8_t end_cyl; uint32_t start_sect; uint32_t nr_sects; -} __attribute__((packed)); +} PACKED; #define MSDOS_MAGIC "\x55\xaa" #define MSDOS_PARTTABLE_OFFSET 0x1be diff --git a/extras/volume_id/libvolume_id/ntfs.c b/extras/volume_id/libvolume_id/ntfs.c index de9ad6d654..fe9ff8d5d6 100644 --- a/extras/volume_id/libvolume_id/ntfs.c +++ b/extras/volume_id/libvolume_id/ntfs.c @@ -52,7 +52,7 @@ struct ntfs_super_block { uint8_t reserved2[3]; uint8_t volume_serial[8]; uint16_t checksum; -} __attribute__((__packed__)) *ns; +} PACKED *ns; struct master_file_table_record { uint8_t magic[4]; @@ -65,7 +65,7 @@ struct master_file_table_record { uint16_t flags; uint32_t bytes_in_use; uint32_t bytes_allocated; -} __attribute__((__packed__)) *mftr; +} PACKED *mftr; struct file_attribute { uint32_t type; @@ -77,13 +77,13 @@ struct file_attribute { uint16_t instance; uint32_t value_len; uint16_t value_offset; -} __attribute__((__packed__)) *attr; +} PACKED *attr; struct volume_info { uint64_t reserved; uint8_t major_ver; uint8_t minor_ver; -} __attribute__((__packed__)) *info; +} PACKED *info; #define MFT_RECORD_VOLUME 3 #define MFT_RECORD_ATTR_VOLUME_NAME 0x60 diff --git a/extras/volume_id/libvolume_id/nvidia_raid.c b/extras/volume_id/libvolume_id/nvidia_raid.c index 3b967e6979..24717aaaec 100644 --- a/extras/volume_id/libvolume_id/nvidia_raid.c +++ b/extras/volume_id/libvolume_id/nvidia_raid.c @@ -32,7 +32,7 @@ struct nvidia_meta { uint32_t size; uint32_t chksum; uint16_t version; -} __attribute__((packed)); +} PACKED; #define NVIDIA_SIGNATURE "NVIDIA" diff --git a/extras/volume_id/libvolume_id/ocfs.c b/extras/volume_id/libvolume_id/ocfs.c index faf89bd3e0..c2f8360cae 100644 --- a/extras/volume_id/libvolume_id/ocfs.c +++ b/extras/volume_id/libvolume_id/ocfs.c @@ -56,7 +56,7 @@ struct ocfs1_super_block_header { uint64_t new_cfg_off; uint32_t prot_bits; int32_t excl_mount; -} __attribute__((__packed__)); +} PACKED; struct ocfs1_super_block_label { struct ocfs1_disk_lock { @@ -69,14 +69,14 @@ struct ocfs1_super_block_label { uint32_t reader_node_num; uint64_t oin_node_map; uint64_t dlock_seq_num; - } disk_lock __attribute__((__packed__)); + } PACKED disk_lock; uint8_t label[64]; uint16_t label_len; uint8_t vol_id[16]; uint16_t vol_id_len; uint8_t cluster_name[64]; uint16_t cluster_name_len; -} __attribute__((__packed__)); +} PACKED; struct ocfs2_super_block { uint8_t i_signature[8]; @@ -125,7 +125,7 @@ struct ocfs2_super_block { uint64_t s_first_cluster_group; uint8_t s_label[64]; uint8_t s_uuid[16]; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off) { diff --git a/extras/volume_id/libvolume_id/promise_raid.c b/extras/volume_id/libvolume_id/promise_raid.c index 6611aeab32..bdf0c7b601 100644 --- a/extras/volume_id/libvolume_id/promise_raid.c +++ b/extras/volume_id/libvolume_id/promise_raid.c @@ -29,7 +29,7 @@ struct promise_meta { uint8_t sig[24]; -} __attribute__((packed)); +} PACKED; #define PDC_CONFIG_OFF 0x1200 #define PDC_SIGNATURE "Promise Technology, Inc." diff --git a/extras/volume_id/libvolume_id/reiserfs.c b/extras/volume_id/libvolume_id/reiserfs.c index 0eecbda5cb..91a5bcb9b0 100644 --- a/extras/volume_id/libvolume_id/reiserfs.c +++ b/extras/volume_id/libvolume_id/reiserfs.c @@ -42,7 +42,7 @@ struct reiserfs_super_block { uint32_t dummy4[5]; uint8_t uuid[16]; uint8_t label[16]; -} __attribute__((__packed__)); +} PACKED; struct reiser4_super_block { uint8_t magic[16]; @@ -50,7 +50,7 @@ struct reiser4_super_block { uint8_t uuid[16]; uint8_t label[16]; uint64_t dummy2; -} __attribute__((__packed__)); +} PACKED; #define REISERFS1_SUPERBLOCK_OFFSET 0x2000 #define REISERFS_SUPERBLOCK_OFFSET 0x10000 diff --git a/extras/volume_id/libvolume_id/romfs.c b/extras/volume_id/libvolume_id/romfs.c index 51ef3739b3..456077d1e1 100644 --- a/extras/volume_id/libvolume_id/romfs.c +++ b/extras/volume_id/libvolume_id/romfs.c @@ -32,7 +32,7 @@ struct romfs_super { uint32_t size; uint32_t checksum; uint8_t name[0]; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_romfs(struct volume_id *id, uint64_t off) { diff --git a/extras/volume_id/libvolume_id/silicon_raid.c b/extras/volume_id/libvolume_id/silicon_raid.c index a307764730..27ac9591a7 100644 --- a/extras/volume_id/libvolume_id/silicon_raid.c +++ b/extras/volume_id/libvolume_id/silicon_raid.c @@ -44,7 +44,7 @@ struct silicon_meta { uint16_t vendor_id; uint16_t minor_ver; uint16_t major_ver; -} __attribute__((packed)); +} PACKED; #define SILICON_MAGIC 0x2F000000 diff --git a/extras/volume_id/libvolume_id/sysv.c b/extras/volume_id/libvolume_id/sysv.c index fc874d5bea..4aa281e9fa 100644 --- a/extras/volume_id/libvolume_id/sysv.c +++ b/extras/volume_id/libvolume_id/sysv.c @@ -56,7 +56,7 @@ struct sysv_super uint32_t s_state; uint32_t s_magic; uint32_t s_type; -} __attribute__((__packed__)); +} PACKED; #define XENIX_NICINOD 100 #define XENIX_NICFREE 100 @@ -82,7 +82,7 @@ struct xenix_super { uint8_t s_fill[371]; uint32_t s_magic; uint32_t s_type; -} __attribute__((__packed__)); +} PACKED; #define SYSV_SUPERBLOCK_BLOCK 0x01 #define SYSV_MAGIC 0xfd187e20 diff --git a/extras/volume_id/libvolume_id/udf.c b/extras/volume_id/libvolume_id/udf.c index fede1ce68a..f0e0d41957 100644 --- a/extras/volume_id/libvolume_id/udf.c +++ b/extras/volume_id/libvolume_id/udf.c @@ -37,28 +37,28 @@ struct volume_descriptor { uint16_t crc; uint16_t crc_len; uint32_t location; - } __attribute__((__packed__)) tag; + } PACKED tag; union { struct anchor_descriptor { uint32_t length; uint32_t location; - } __attribute__((__packed__)) anchor; + } PACKED anchor; struct primary_descriptor { uint32_t seq_num; uint32_t desc_num; struct dstring { uint8_t clen; uint8_t c[31]; - } __attribute__((__packed__)) ident; - } __attribute__((__packed__)) primary; - } __attribute__((__packed__)) type; -} __attribute__((__packed__)); + } PACKED ident; + } PACKED primary; + } PACKED type; +} PACKED; struct volume_structure_descriptor { uint8_t type; uint8_t id[5]; uint8_t version; -} __attribute__((__packed__)); +} PACKED; #define UDF_VSD_OFFSET 0x8000 diff --git a/extras/volume_id/libvolume_id/ufs.c b/extras/volume_id/libvolume_id/ufs.c index ace61db657..2351d1f926 100644 --- a/extras/volume_id/libvolume_id/ufs.c +++ b/extras/volume_id/libvolume_id/ufs.c @@ -80,7 +80,7 @@ struct ufs_super_block { uint32_t cs_nbfree; uint32_t cs_nifree; uint32_t cs_nffree; - } __attribute__((__packed__)) fs_cstotal; + } PACKED fs_cstotal; int8_t fs_fmod; int8_t fs_clean; int8_t fs_ronly; @@ -93,7 +93,7 @@ struct ufs_super_block { uint32_t fs_maxcluster; uint32_t fs_cpc; uint16_t fs_opostbl[16][8]; - } __attribute__((__packed__)) fs_u1; + } PACKED fs_u1; struct { int8_t fs_fsmnt[468]; uint8_t fs_volname[32]; @@ -116,17 +116,17 @@ struct ufs_super_block { uint64_t cs_nffree; uint64_t cs_numclusters; uint64_t cs_spare[3]; - } __attribute__((__packed__)) fs_cstotal; + } PACKED fs_cstotal; struct ufs_timeval { int32_t tv_sec; int32_t tv_usec; - } __attribute__((__packed__)) fs_time; + } PACKED fs_time; int64_t fs_size; int64_t fs_dsize; uint64_t fs_csaddr; int64_t fs_pendingblocks; int32_t fs_pendinginodes; - } __attribute__((__packed__)) fs_u2; + } PACKED fs_u2; } fs_u11; union { struct { @@ -136,7 +136,7 @@ struct ufs_super_block { int32_t fs_state; uint32_t fs_qbmask[2]; uint32_t fs_qfmask[2]; - } __attribute__((__packed__)) fs_sun; + } PACKED fs_sun; struct { int32_t fs_sparecon[53]; int32_t fs_reclaim; @@ -144,7 +144,7 @@ struct ufs_super_block { uint32_t fs_npsect; uint32_t fs_qbmask[2]; uint32_t fs_qfmask[2]; - } __attribute__((__packed__)) fs_sunx86; + } PACKED fs_sunx86; struct { int32_t fs_sparecon[50]; int32_t fs_contigsumsize; @@ -154,7 +154,7 @@ struct ufs_super_block { uint32_t fs_qbmask[2]; uint32_t fs_qfmask[2]; int32_t fs_state; - } __attribute__((__packed__)) fs_44; + } PACKED fs_44; } fs_u2; int32_t fs_postblformat; int32_t fs_nrpos; @@ -162,7 +162,7 @@ struct ufs_super_block { int32_t fs_rotbloff; uint32_t fs_magic; uint8_t fs_space[1]; -} __attribute__((__packed__)); +} PACKED; #define UFS_MAGIC 0x00011954 #define UFS2_MAGIC 0x19540119 diff --git a/extras/volume_id/libvolume_id/via_raid.c b/extras/volume_id/libvolume_id/via_raid.c index 66962cd7f0..375a20979d 100644 --- a/extras/volume_id/libvolume_id/via_raid.c +++ b/extras/volume_id/libvolume_id/via_raid.c @@ -36,10 +36,10 @@ struct via_meta { uint32_t capacity_low; uint32_t capacity_high; uint32_t serial_checksum; - } __attribute((packed)) array; + } PACKED array; uint32_t serial_checksum[8]; uint8_t checksum; -} __attribute__((packed)); +} PACKED; #define VIA_SIGNATURE 0xAA55 diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/volume_id.h index edeb225faf..0f265a584d 100644 --- a/extras/volume_id/libvolume_id/volume_id.h +++ b/extras/volume_id/libvolume_id/volume_id.h @@ -16,6 +16,10 @@ #define VOLUME_ID_VERSION 56 +#ifndef PACKED +#define PACKED __attribute__((packed)) +#endif + #define VOLUME_ID_LABEL_SIZE 64 #define VOLUME_ID_UUID_SIZE 36 #define VOLUME_ID_FORMAT_SIZE 32 diff --git a/extras/volume_id/libvolume_id/vxfs.c b/extras/volume_id/libvolume_id/vxfs.c index 0aef369899..883c1266a4 100644 --- a/extras/volume_id/libvolume_id/vxfs.c +++ b/extras/volume_id/libvolume_id/vxfs.c @@ -32,7 +32,7 @@ struct vxfs_super { uint32_t vs_magic; int32_t vs_version; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_vxfs(struct volume_id *id, uint64_t off) { diff --git a/extras/volume_id/libvolume_id/xfs.c b/extras/volume_id/libvolume_id/xfs.c index a5f5d8432c..934ed2d877 100644 --- a/extras/volume_id/libvolume_id/xfs.c +++ b/extras/volume_id/libvolume_id/xfs.c @@ -40,7 +40,7 @@ struct xfs_super_block { uint64_t icount; uint64_t ifree; uint64_t fdblocks; -} __attribute__((__packed__)); +} PACKED; int volume_id_probe_xfs(struct volume_id *id, uint64_t off) { |