[edk2-devel] [PATCH 1/6] UefiPayloadPkg: Use C99 flexible arrays

[Elyes Haouas <ehaouas@noos.fr>]

One-element or zero-length arrays have been deprecated since
last millennium.
Use C99 flexible arrays instead, it allows the compiler to
generate errors when the flexible array does not occur at the
end in the structure.

Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
---
 UefiPayloadPkg/Include/Coreboot.h                    | 12 ++++++------
 UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h      |  2 +-
 UefiPayloadPkg/Include/Guid/PayloadCommandLine.h     |  2 +-
 UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h    |  2 +-
 .../Include/Guid/SmmS3CommunicationInfoGuid.h        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UefiPayloadPkg/Include/Coreboot.h b/UefiPayloadPkg/Include/Coreboot.h
index 2d454f7c89..caf15e1356 100644
--- a/UefiPayloadPkg/Include/Coreboot.h
+++ b/UefiPayloadPkg/Include/Coreboot.h
@@ -59,7 +59,7 @@ struct cbmem_root {
   UINT32                num_entries;
   UINT32                locked;
   UINT32                size;
-  struct cbmem_entry    entries[0];
+  struct cbmem_entry    entries[];
 };
 
 struct imd_entry {
@@ -75,7 +75,7 @@ struct imd_root {
   UINT32              flags;
   UINT32              entry_align;
   UINT32              max_offset;
-  struct imd_entry    entries[0];
+  struct imd_entry    entries[];
 };
 
 struct cbuint64 {
@@ -119,7 +119,7 @@ struct cb_memory_range {
 struct cb_memory {
   UINT32                    tag;
   UINT32                    size;
-  struct cb_memory_range    map[0];
+  struct cb_memory_range    map[];
 };
 
 #define CB_TAG_MAINBOARD  0x0003
@@ -129,7 +129,7 @@ struct cb_mainboard {
   UINT32    size;
   UINT8     vendor_idx;
   UINT8     part_number_idx;
-  UINT8     strings[0];
+  UINT8     strings[];
 };
 
 #define CB_TAG_VERSION         0x0004
@@ -146,7 +146,7 @@ struct cb_mainboard {
 struct cb_string {
   UINT32    tag;
   UINT32    size;
-  UINT8     string[0];
+  UINT8     string[];
 };
 
 #define CB_TAG_SERIAL  0x000f
@@ -239,7 +239,7 @@ struct cb_vdat {
 struct cbmem_console {
   UINT32    size;
   UINT32    cursor;
-  UINT8     body[0];
+  UINT8     body[];
 } __attribute__ ((packed));
 
 #define CB_TAG_MRC_CACHE  0x0018
diff --git a/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h b/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h
index 1b9b2b7fbc..e25730d85f 100644
--- a/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h
@@ -29,7 +29,7 @@ typedef struct {
   UINT8               Revision;
   UINT8               Reserved0[3];
   UINT32              Count;
-  MEMORY_MAP_ENTRY    Entry[0];
+  MEMORY_MAP_ENTRY    Entry[];
 } MEMORY_MAP_INFO;
 #pragma pack()
 
diff --git a/UefiPayloadPkg/Include/Guid/PayloadCommandLine.h b/UefiPayloadPkg/Include/Guid/PayloadCommandLine.h
index 845a30efe1..6a73c79e9d 100644
--- a/UefiPayloadPkg/Include/Guid/PayloadCommandLine.h
+++ b/UefiPayloadPkg/Include/Guid/PayloadCommandLine.h
@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 typedef struct {
   UNIVERSAL_PAYLOAD_GENERIC_HEADER    Header;
   UINT32                              Count;
-  CHAR8                               CommandLine[0];
+  CHAR8                               CommandLine[];
 } UNIVERSAL_PAYLOAD_COMMAND_LINE;
 
 #pragma pack()
diff --git a/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h b/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h
index 665eaa7e77..f6761e1997 100644
--- a/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h
@@ -39,7 +39,7 @@ typedef struct {
   UINT16                  Revision;
   UINT16                  Reserved;
   UINT32                  Count;
-  PLD_GENERIC_REGISTER    Registers[0];
+  PLD_GENERIC_REGISTER    Registers[];
 } PLD_SMM_REGISTERS;
 
 #pragma pack()
diff --git a/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h b/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h
index 0f7006a5f4..96ed52d872 100644
--- a/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h
@@ -36,7 +36,7 @@ typedef struct {
   UINT8          SwSmiTriggerValue;
   UINT16         Reserved;
   UINT32         CpuCount;
-  CPU_SMMBASE    SmmBase[0];
+  CPU_SMMBASE    SmmBase[];
 } SMM_S3_INFO;
 
 //
-- 
2.40.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108010): https://edk2.groups.io/g/devel/message/108010
Mute This Topic: https://groups.io/mt/100935956/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-