aboutsummaryrefslogtreecommitdiff
path: root/util-linux/volume_id/volume_id.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2020-11-30 13:03:03 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2020-11-30 13:03:03 +0100
commit965b795b87c59ed45cc7f16a62301dbae65b1627 (patch)
tree958e486f4f23177746ddee11913d3b59ff4e7f8e /util-linux/volume_id/volume_id.c
parent2fba2f5bb99145eaa1635fe5a162426158d56a2c (diff)
downloadbusybox-w32-965b795b87c59ed45cc7f16a62301dbae65b1627.tar.gz
busybox-w32-965b795b87c59ed45cc7f16a62301dbae65b1627.tar.bz2
busybox-w32-965b795b87c59ed45cc7f16a62301dbae65b1627.zip
decrease paddign: gcc-9.3.1 slaps 32-byte alignment on arrays willy-nilly
text data bss dec hex filename 1021988 559 5052 1027599 fae0f busybox_old 1021236 559 5052 1026847 fab1f busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
-rw-r--r--util-linux/volume_id/volume_id.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index 99150a5b7..8ceb61bde 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -49,7 +49,7 @@
49typedef int FAST_FUNC (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size); 49typedef int FAST_FUNC (*raid_probe_fptr)(struct volume_id *id, /*uint64_t off,*/ uint64_t size);
50typedef int FAST_FUNC (*probe_fptr)(struct volume_id *id /*, uint64_t off*/); 50typedef int FAST_FUNC (*probe_fptr)(struct volume_id *id /*, uint64_t off*/);
51 51
52static const raid_probe_fptr raid1[] = { 52static const raid_probe_fptr raid1[] ALIGN_PTR = {
53#if ENABLE_FEATURE_VOLUMEID_LINUXRAID 53#if ENABLE_FEATURE_VOLUMEID_LINUXRAID
54 volume_id_probe_linux_raid, 54 volume_id_probe_linux_raid,
55#endif 55#endif
@@ -76,7 +76,7 @@ static const raid_probe_fptr raid1[] = {
76#endif 76#endif
77}; 77};
78 78
79static const probe_fptr raid2[] = { 79static const probe_fptr raid2[] ALIGN_PTR = {
80#if ENABLE_FEATURE_VOLUMEID_LVM 80#if ENABLE_FEATURE_VOLUMEID_LVM
81 volume_id_probe_lvm1, 81 volume_id_probe_lvm1,
82 volume_id_probe_lvm2, 82 volume_id_probe_lvm2,
@@ -90,7 +90,7 @@ static const probe_fptr raid2[] = {
90}; 90};
91 91
92/* signature in the first block, only small buffer needed */ 92/* signature in the first block, only small buffer needed */
93static const probe_fptr fs1[] = { 93static const probe_fptr fs1[] ALIGN_PTR = {
94#if ENABLE_FEATURE_VOLUMEID_FAT 94#if ENABLE_FEATURE_VOLUMEID_FAT
95 volume_id_probe_vfat, 95 volume_id_probe_vfat,
96#endif 96#endif
@@ -118,7 +118,7 @@ static const probe_fptr fs1[] = {
118}; 118};
119 119
120/* fill buffer with maximum */ 120/* fill buffer with maximum */
121static const probe_fptr fs2[] = { 121static const probe_fptr fs2[] ALIGN_PTR = {
122#if ENABLE_FEATURE_VOLUMEID_LINUXSWAP 122#if ENABLE_FEATURE_VOLUMEID_LINUXSWAP
123 volume_id_probe_linux_swap, 123 volume_id_probe_linux_swap,
124#endif 124#endif