diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-16 00:58:11 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-16 00:58:11 +0200 |
commit | 8dc0e1929e3af3b1673e5a8e486808386400c020 (patch) | |
tree | 0550684999338af8f15de76c5599f9dead3fdfd6 /util-linux/mkfs_vfat.c | |
parent | f2c184be835fbcbd04d06fce22783c6a5d37b563 (diff) | |
download | busybox-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/mkfs_vfat.c')
-rw-r--r-- | util-linux/mkfs_vfat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index bdd4dd803..10de2af5b 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
@@ -79,7 +79,7 @@ struct msdos_dir_entry { | |||
79 | uint16_t date; /* 018 date */ | 79 | uint16_t date; /* 018 date */ |
80 | uint16_t start; /* 01a first cluster */ | 80 | uint16_t start; /* 01a first cluster */ |
81 | uint32_t size; /* 01c file size in bytes */ | 81 | uint32_t size; /* 01c file size in bytes */ |
82 | } __attribute__ ((packed)); | 82 | } PACKED; |
83 | 83 | ||
84 | /* Example of boot sector's beginning: | 84 | /* Example of boot sector's beginning: |
85 | 0000 eb 58 90 4d 53 57 49 4e 34 2e 31 00 02 08 26 00 |...MSWIN4.1...&.| | 85 | 0000 eb 58 90 4d 53 57 49 4e 34 2e 31 00 02 08 26 00 |...MSWIN4.1...&.| |
@@ -96,7 +96,7 @@ struct msdos_volume_info { /* (offsets are relative to start of boot sector) */ | |||
96 | uint32_t volume_id32; /* 043 volume ID number */ | 96 | uint32_t volume_id32; /* 043 volume ID number */ |
97 | char volume_label[11];/* 047 volume label */ | 97 | char volume_label[11];/* 047 volume label */ |
98 | char fs_type[8]; /* 052 typically "FATnn" */ | 98 | char fs_type[8]; /* 052 typically "FATnn" */ |
99 | } __attribute__ ((packed)); /* 05a end. Total size 26 (0x1a) bytes */ | 99 | } PACKED; /* 05a end. Total size 26 (0x1a) bytes */ |
100 | 100 | ||
101 | struct msdos_boot_sector { | 101 | struct msdos_boot_sector { |
102 | char boot_jump[3]; /* 000 short or near jump instruction */ | 102 | char boot_jump[3]; /* 000 short or near jump instruction */ |
@@ -124,7 +124,7 @@ struct msdos_boot_sector { | |||
124 | char boot_code[0x200 - 0x5a - 2]; /* 05a */ | 124 | char boot_code[0x200 - 0x5a - 2]; /* 05a */ |
125 | #define BOOT_SIGN 0xAA55 | 125 | #define BOOT_SIGN 0xAA55 |
126 | uint16_t boot_sign; /* 1fe */ | 126 | uint16_t boot_sign; /* 1fe */ |
127 | } __attribute__ ((packed)); | 127 | } PACKED; |
128 | 128 | ||
129 | #define FAT_FSINFO_SIG1 0x41615252 | 129 | #define FAT_FSINFO_SIG1 0x41615252 |
130 | #define FAT_FSINFO_SIG2 0x61417272 | 130 | #define FAT_FSINFO_SIG2 0x61417272 |
@@ -137,7 +137,7 @@ struct fat32_fsinfo { | |||
137 | uint32_t reserved2[3]; | 137 | uint32_t reserved2[3]; |
138 | uint16_t reserved3; /* 1fc */ | 138 | uint16_t reserved3; /* 1fc */ |
139 | uint16_t boot_sign; /* 1fe */ | 139 | uint16_t boot_sign; /* 1fe */ |
140 | } __attribute__ ((packed)); | 140 | } PACKED; |
141 | 141 | ||
142 | struct bug_check { | 142 | struct bug_check { |
143 | char BUG1[sizeof(struct msdos_dir_entry ) == 0x20 ? 1 : -1]; | 143 | char BUG1[sizeof(struct msdos_dir_entry ) == 0x20 ? 1 : -1]; |