Add missing braces around initializer.

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Qian Ouyang <qian.ouyang@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13817 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 153 insertions, 107 deletions

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 182f896dbb..3e4706c288 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -23,22 +23,24 @@ SHELL_INFO ShellInfoObject = {
   FALSE,

   FALSE,

   {

-    0,

-    0,

-    0,

-    0,

-    0,

-    0,

-    0,

-    0,

-    0,

+    {{

+      0,

+      0,

+      0,

+      0,

+      0,

+      0,

+      0,

+      0,

+      0

+    }},

     0,

     NULL,

     NULL

   },

-  {0,0},

+  {{NULL, NULL}, NULL},

   {

-    {0,0},

+    {{NULL, NULL}, NULL},

     0,

     0,

     TRUE

@@ -50,8 +52,12 @@ SHELL_INFO ShellInfoObject = {
   NULL,

   NULL,

   NULL,

-  {0,0,NULL,NULL},

-  {0,0},

+  {{NULL, NULL}, NULL, NULL},

+  {{NULL, NULL}, NULL, NULL},

+  NULL,

+  NULL,

+  NULL,

+  NULL,

   NULL,

   NULL,

   NULL,

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 202e1fa020..37ac6e4289 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -442,17 +442,17 @@ DevicePathProtocolDumpInformation(
 //

 #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \

   { \

-    0x58c518b1, 0x76f3, 0x11d4, 0xbc, 0xea, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \

+    0x58c518b1, 0x76f3, 0x11d4, { 0xbc, 0xea, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \

   }

 

 #define LOCAL_EFI_WIN_NT_BUS_DRIVER_IO_PROTOCOL_GUID \

   { \

-    0x96eb4ad6, 0xa32a, 0x11d4, 0xbc, 0xfd, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \

+    0x96eb4ad6, 0xa32a, 0x11d4, { 0xbc, 0xfd, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \

   }

 

 #define LOCAL_EFI_WIN_NT_SERIAL_PORT_GUID \

   { \

-    0xc95a93d, 0xa006, 0x11d4, 0xbc, 0xfa, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \

+    0xc95a93d, 0xa006, 0x11d4, { 0xbc, 0xfa, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \

   }

 STATIC CONST EFI_GUID WinNtThunkProtocolGuid = LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID;

 STATIC CONST EFI_GUID WinNtIoProtocolGuid    = LOCAL_EFI_WIN_NT_BUS_DRIVER_IO_PROTOCOL_GUID;

diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 9fbcbb3eb2..23ff12370e 100644
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -1,7 +1,7 @@
 /** @file

   Main file for support of shell consist mapping.

 

-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution. The full text of the license may be found at

@@ -950,90 +950,132 @@ DevPathSerialDefault (
 }

 

 DEV_PATH_CONSIST_MAPPING_TABLE  DevPathConsistMappingTable[] = {

-  HARDWARE_DEVICE_PATH,

-  HW_PCI_DP,

-  DevPathSerialDefault,

-  DevPathComparePci,

-  ACPI_DEVICE_PATH,

-  ACPI_DP,

-  DevPathSerialAcpi,

-  DevPathCompareAcpi,

-  MESSAGING_DEVICE_PATH,

-  MSG_ATAPI_DP,

-  DevPathSerialAtapi,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_SCSI_DP,

-  DevPathSerialScsi,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_FIBRECHANNEL_DP,

-  DevPathSerialFibre,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_1394_DP,

-  DevPathSerial1394,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_USB_DP,

-  DevPathSerialUsb,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_I2O_DP,

-  DevPathSerialI2O,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_MAC_ADDR_DP,

-  DevPathSerialMacAddr,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_IPv4_DP,

-  DevPathSerialIPv4,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_IPv6_DP,

-  DevPathSerialIPv6,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_INFINIBAND_DP,

-  DevPathSerialInfiniBand,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_UART_DP,

-  DevPathSerialUart,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_VENDOR_DP,

-  DevPathSerialVendor,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_DEVICE_LOGICAL_UNIT_DP,

-  DevPathSerialLun,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_SATA_DP,

-  DevPathSerialSata,

-  DevPathCompareDefault,

-  MESSAGING_DEVICE_PATH,

-  MSG_ISCSI_DP,

-  DevPathSerialIScsi,

-  DevPathCompareDefault,

-  MEDIA_DEVICE_PATH,

-  MEDIA_HARDDRIVE_DP,

-  DevPathSerialHardDrive,

-  DevPathCompareDefault,

-  MEDIA_DEVICE_PATH,

-  MEDIA_CDROM_DP,

-  DevPathSerialCdRom,

-  DevPathCompareDefault,

-  MEDIA_DEVICE_PATH,

-  MEDIA_VENDOR_DP,

-  DevPathSerialVendor,

-  DevPathCompareDefault,

-  0,

-  0,

-  NULL,

-  NULL

+  {

+    HARDWARE_DEVICE_PATH,

+    HW_PCI_DP,

+    DevPathSerialDefault,

+    DevPathComparePci

+  },

+  {

+    ACPI_DEVICE_PATH,

+    ACPI_DP,

+    DevPathSerialAcpi,

+    DevPathCompareAcpi

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_ATAPI_DP,

+    DevPathSerialAtapi,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_SCSI_DP,

+    DevPathSerialScsi,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_FIBRECHANNEL_DP,

+    DevPathSerialFibre,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_1394_DP,

+    DevPathSerial1394,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_USB_DP,

+    DevPathSerialUsb,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_I2O_DP,

+    DevPathSerialI2O,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_MAC_ADDR_DP,

+    DevPathSerialMacAddr,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_IPv4_DP,

+    DevPathSerialIPv4,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_IPv6_DP,

+    DevPathSerialIPv6,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_INFINIBAND_DP,

+    DevPathSerialInfiniBand,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_UART_DP,

+    DevPathSerialUart,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_VENDOR_DP,

+    DevPathSerialVendor,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_DEVICE_LOGICAL_UNIT_DP,

+    DevPathSerialLun,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_SATA_DP,

+    DevPathSerialSata,

+    DevPathCompareDefault

+  },

+  {

+    MESSAGING_DEVICE_PATH,

+    MSG_ISCSI_DP,

+    DevPathSerialIScsi,

+    DevPathCompareDefault

+  },

+  {

+    MEDIA_DEVICE_PATH,

+    MEDIA_HARDDRIVE_DP,

+    DevPathSerialHardDrive,

+    DevPathCompareDefault

+  },

+  {

+    MEDIA_DEVICE_PATH,

+    MEDIA_CDROM_DP,

+    DevPathSerialCdRom,

+    DevPathCompareDefault

+  },

+  {

+    MEDIA_DEVICE_PATH,

+    MEDIA_VENDOR_DP,

+    DevPathSerialVendor,

+    DevPathCompareDefault

+  },

+  {

+    0,

+    0,

+    NULL,

+    NULL

+  }

 };

 

 /**

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
index c5e47b105b..3583dd3df6 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Edit/MainTextEditor.c
@@ -1,7 +1,7 @@
 /** @file

   Implements editor interface functions.

 

-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>

+  Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved. <BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -1399,8 +1399,7 @@ INTN                          OriginalMode;
 EFI_EDITOR_GLOBAL_EDITOR      MainEditorConst = {

   &FileBuffer,

   {

-    0,

-    0

+    {0, 0}

   },

   {

     0,

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index 808f7a56c0..446dac7e01 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -4,7 +4,7 @@
      - Instances of the other objects of the editor

      - Main Interfaces

   

-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>

+  Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved. <BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -50,8 +50,7 @@ HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorBackupVar;
 HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorConst = {

   &HBufferImage,

   {

-    0,

-    0

+    {0, 0}

   },

   {

     0,