d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fstyp: Remove __packed from struct exfat_de_label.

Browse Source 
This fixes a -Waddress-of-packed-member warning about a possibly
unaligned pointer from GCC 9 when calling convert_label().

__packed has to be removed from struct exfat_dirent as well to fix an
alignment warning when casting from a struct exfat_dirent pointer to a
struct exfat_de_label pointer.

Reviewed by:	cem
Differential Revision:	https://reviews.freebsd.org/D32144
This commit is contained in:
John Baldwin 2022-01-31 17:33:31 -08:00
parent 6c9ed42828
commit 58862c0bea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/fstyp/exfat.c
View File

@ -111,7 +111,7 @@ struct exfat_dirent {
} u;
uint32_t xde_first_cluster;
uint64_t xde_data_len;
} __packed;
};
#define xde_generic u.xde_generic_
#define xde_secondary_count u.xde_primary_.xde_secondary_count
#define xde_set_chksum u.xde_primary_.xde_set_chksum_
@ -124,7 +124,7 @@ struct exfat_de_label {
uint8_t xdel_char_cnt; /* Length of UCS-2 label */
uint16_t xdel_vol_lbl[11];
uint8_t xdel_reserved[8];
} __packed;
};
_Static_assert(sizeof(struct exfat_de_label) == 32, "spec");
#define MAIN_BOOT_REGION_SECT 0