wok-current annotate efivar/stuff/0004-Fix-another-error-of-Werror-address-of-packed-member.patch @ rev 25788

Mass update to fix build with gcc10 and up others packages
author Stanislas Leduc <shann@slitaz.org>
date Tue Sep 30 07:43:04 2025 +0000 (3 weeks ago)
parents
children
rev   line source
shann@25788 1 From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001
shann@25788 2 From: Chih-Wei Huang <cwhuang@linux.org.tw>
shann@25788 3 Date: Tue, 26 Feb 2019 18:42:20 +0800
shann@25788 4 Subject: [PATCH] Fix another error of -Werror=address-of-packed-member
shann@25788 5
shann@25788 6 Android 9 clang complains:
shann@25788 7
shann@25788 8 external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]
shann@25788 9 (efi_guid_t *)&dp->infiniband.ioc_guid);
shann@25788 10 ^~~~~~~~~~~~~~~~~~~~~~~
shann@25788 11 external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid'
shann@25788 12 memmove(&_guid, guid, sizeof(_guid)); \
shann@25788 13 ^~~~
shann@25788 14 1 error generated.
shann@25788 15
shann@25788 16 Since commit c3c553d the fifth parameter of format_guid() is treated as
shann@25788 17 a const void *. The casting is unnecessary.
shann@25788 18
shann@25788 19 Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
shann@25788 20 [james.hilliard1@gmail.com: backport from upstream commit
shann@25788 21 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865]
shann@25788 22 Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
shann@25788 23 ---
shann@25788 24 src/dp-media.c | 3 +--
shann@25788 25 src/dp-message.c | 2 +-
shann@25788 26 2 files changed, 2 insertions(+), 3 deletions(-)
shann@25788 27
shann@25788 28 diff --git a/src/dp-media.c b/src/dp-media.c
shann@25788 29 index 96a576f..be691c4 100644
shann@25788 30 --- a/src/dp-media.c
shann@25788 31 +++ b/src/dp-media.c
shann@25788 32 @@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp)
shann@25788 33 break;
shann@25788 34 case EFIDP_HD_SIGNATURE_GUID:
shann@25788 35 format(buf, size, off, "HD", "GPT,");
shann@25788 36 - format_guid(buf, size, off, "HD",
shann@25788 37 - (efi_guid_t *)dp->hd.signature);
shann@25788 38 + format_guid(buf, size, off, "HD", dp->hd.signature);
shann@25788 39 format(buf, size, off, "HD",
shann@25788 40 ",0x%"PRIx64",0x%"PRIx64")",
shann@25788 41 dp->hd.start, dp->hd.size);
shann@25788 42 diff --git a/src/dp-message.c b/src/dp-message.c
shann@25788 43 index 9f96466..6b8e907 100644
shann@25788 44 --- a/src/dp-message.c
shann@25788 45 +++ b/src/dp-message.c
shann@25788 46 @@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
shann@25788 47 dp->infiniband.port_gid[1],
shann@25788 48 dp->infiniband.port_gid[0]);
shann@25788 49 format_guid(buf, size, off, "Infiniband",
shann@25788 50 - (efi_guid_t *)&dp->infiniband.ioc_guid);
shann@25788 51 + &dp->infiniband.ioc_guid);
shann@25788 52 format(buf, size, off, "Infiniband",
shann@25788 53 ",%"PRIu64",%"PRIu64")",
shann@25788 54 dp->infiniband.target_port_id,
shann@25788 55 --
shann@25788 56 2.20.1
shann@25788 57
shann@25788 58