From: Jan Janssen <medhefgo@web.de>
Date: Fri, 10 Dec 2021 09:53:35 +0000 (+0100)
Subject: boot: Make OFFSETOF lowercase
X-Git-Tag: v250-rc3~62^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7700e9ba151338036131c89f37d4b2da5cc1af11;p=thirdparty%2Fsystemd.git

boot: Make OFFSETOF lowercase

This is more in line with the userspace offsetof.
---

diff --git a/src/boot/efi/measure.c b/src/boot/efi/measure.c
index 4b6e8776ca0..4384c9dbf0f 100644
--- a/src/boot/efi/measure.c
+++ b/src/boot/efi/measure.c
@@ -26,7 +26,7 @@ static EFI_STATUS tpm1_measure_to_pcr_and_event_log(
         assert(description);
 
         desc_len = StrSize(description);
-        tcg_event = xallocate_zero_pool(OFFSETOF(TCG_PCR_EVENT, Event) + desc_len);
+        tcg_event = xallocate_zero_pool(offsetof(TCG_PCR_EVENT, Event) + desc_len);
         *tcg_event = (TCG_PCR_EVENT) {
                 .EventSize = desc_len,
                 .PCRIndex = pcrindex,
@@ -57,9 +57,9 @@ static EFI_STATUS tpm2_measure_to_pcr_and_event_log(
         assert(description);
 
         desc_len = StrSize(description);
-        tcg_event = xallocate_zero_pool(OFFSETOF(EFI_TCG2_EVENT, Event) + desc_len);
+        tcg_event = xallocate_zero_pool(offsetof(EFI_TCG2_EVENT, Event) + desc_len);
         *tcg_event = (EFI_TCG2_EVENT) {
-                .Size = OFFSETOF(EFI_TCG2_EVENT, Event) + desc_len,
+                .Size = offsetof(EFI_TCG2_EVENT, Event) + desc_len,
                 .Header.HeaderSize = sizeof(EFI_TCG2_EVENT_HEADER),
                 .Header.HeaderVersion = EFI_TCG2_EVENT_HEADER_VERSION,
                 .Header.PCRIndex = pcrindex,
diff --git a/src/boot/efi/pe.c b/src/boot/efi/pe.c
index 91e7529fb1f..ed3b0b8e94b 100644
--- a/src/boot/efi/pe.c
+++ b/src/boot/efi/pe.c
@@ -129,7 +129,7 @@ static inline BOOLEAN verify_pe(const struct PeFileHeader *pe) {
 static inline UINTN section_table_offset(const struct DosFileHeader *dos, const struct PeFileHeader *pe) {
         assert(dos);
         assert(pe);
-        return dos->ExeHeader + OFFSETOF(struct PeFileHeader, OptionalHeader) + pe->FileHeader.SizeOfOptionalHeader;
+        return dos->ExeHeader + offsetof(struct PeFileHeader, OptionalHeader) + pe->FileHeader.SizeOfOptionalHeader;
 }
 
 static void locate_sections(
diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c
index 443a3bd3800..c59829b46dc 100644
--- a/src/boot/efi/util.c
+++ b/src/boot/efi/util.c
@@ -566,7 +566,7 @@ EFI_STATUS get_file_info_harder(
                 EFI_FILE_INFO **ret,
                 UINTN *ret_size) {
 
-        UINTN size = OFFSETOF(EFI_FILE_INFO, FileName) + 256;
+        UINTN size = offsetof(EFI_FILE_INFO, FileName) + 256;
         _cleanup_freepool_ EFI_FILE_INFO *fi = NULL;
         EFI_STATUS err;
 
@@ -610,7 +610,7 @@ EFI_STATUS readdir_harder(
          * the specified buffer needs to be freed by caller, after final use. */
 
         if (!*buffer) {
-                sz = OFFSETOF(EFI_FILE_INFO, FileName) /* + 256 */;
+                sz = offsetof(EFI_FILE_INFO, FileName) /* + 256 */;
                 *buffer = xallocate_pool(sz);
                 *buffer_size = sz;
         } else
diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
index 07ffcdc1ef9..853885611eb 100644
--- a/src/boot/efi/util.h
+++ b/src/boot/efi/util.h
@@ -13,7 +13,7 @@
 /* This TPM PCR is where most Linux infrastructure extends the initrd binary images into, and so do we. */
 #define TPM_PCR_INDEX_INITRD 4
 
-#define OFFSETOF(x,y) __builtin_offsetof(x,y)
+#define offsetof(type, member) __builtin_offsetof(type, member)
 
 #define UINTN_MAX (~(UINTN)0)
 #define INTN_MAX ((INTN)(UINTN_MAX>>1))