[edk2,edk2-staging,08/20] IntelUndiPkg/XGigUndiDxe: add missing braces to GUID literals

Message ID 20181115023353.20159-9-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/XGigUndiDxe: fix GCC / ARM build issues
Related show

Commit Message

Ard Biesheuvel Nov. 15, 2018, 2:33 a.m.
The Data4 member of the GUID/EFI_GUID struct type is an array of
UINT8, so literals require two sets of { } braces. Add them where
missing.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 IntelUndiPkg/XGigUndiDxe/NVDataStruc.h | 4 ++--
 IntelUndiPkg/XGigUndiDxe/StartStop.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.17.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ryszard Knop Jan. 30, 2019, 4:06 p.m. | #1
Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com>


On Wed, 2018-11-14 at 18:33 -0800, ard.biesheuvela wrote:
> The Data4 member of the GUID/EFI_GUID struct type is an array of

> UINT8, so literals require two sets of { } braces. Add them where

> missing.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>

> ---

>  IntelUndiPkg/XGigUndiDxe/NVDataStruc.h | 4 ++--

>  IntelUndiPkg/XGigUndiDxe/StartStop.h   | 4 ++--

>  2 files changed, 4 insertions(+), 4 deletions(-)

> 

> diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> index e5e669681b07..63dd841277ab 100644

> --- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> +++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h

> @@ -34,12 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE

> POSSIBILITY OF SUCH DAMAGE.

>  

>  #define XGBE_HII_FORM_GUID \

>    { \

> -    0x25fd9f0b, 0xa3ef, 0x4788, 0xa4, 0x0c, 0x81, 0x84, 0x9d, 0x17,

> 0x8a, 0x6c \

> +    0x25fd9f0b, 0xa3ef, 0x4788, { 0xa4, 0x0c, 0x81, 0x84, 0x9d,

> 0x17, 0x8a, 0x6c } \

>    }

>  

>  #define XGBE_HII_DATA_GUID \

>    { \

> -    0xe2c85968, 0x6906, 0x4b27, 0x9d, 0x09, 0x33, 0x43, 0xaf, 0x06,

> 0x46, 0x76 \

> +    0xe2c85968, 0x6906, 0x4b27, { 0x9d, 0x09, 0x33, 0x43, 0xaf,

> 0x06, 0x46, 0x76 } \

>    }

>  

>  

> diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.h

> b/IntelUndiPkg/XGigUndiDxe/StartStop.h

> index 03ad3dc9cecc..5dfc45c7de6a 100644

> --- a/IntelUndiPkg/XGigUndiDxe/StartStop.h

> +++ b/IntelUndiPkg/XGigUndiDxe/StartStop.h

> @@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE

> POSSIBILITY OF SUCH DAMAGE.

>  #include "Xgbe.h"

>  

>  #define EFI_DRIVER_STOP_PROTOCOL_GUID \

> -  { 0x34d59603, 0x1428, 0x4429, 0xa4, 0x14, 0xe6, 0xb3, \

> -    0xb5, 0xfd, 0x7d, 0xc1 }

> +  { 0x34d59603, 0x1428, 0x4429, { 0xa4, 0x14, 0xe6, 0xb3, \

> +    0xb5, 0xfd, 0x7d, 0xc1 } }

>  

>  typedef struct EFI_DRIVER_STOP_PROTOCOL_S  EFI_DRIVER_STOP_PROTOCOL;

>  


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
index e5e669681b07..63dd841277ab 100644
--- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
+++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
@@ -34,12 +34,12 @@  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define XGBE_HII_FORM_GUID \
   { \
-    0x25fd9f0b, 0xa3ef, 0x4788, 0xa4, 0x0c, 0x81, 0x84, 0x9d, 0x17, 0x8a, 0x6c \
+    0x25fd9f0b, 0xa3ef, 0x4788, { 0xa4, 0x0c, 0x81, 0x84, 0x9d, 0x17, 0x8a, 0x6c } \
   }
 
 #define XGBE_HII_DATA_GUID \
   { \
-    0xe2c85968, 0x6906, 0x4b27, 0x9d, 0x09, 0x33, 0x43, 0xaf, 0x06, 0x46, 0x76 \
+    0xe2c85968, 0x6906, 0x4b27, { 0x9d, 0x09, 0x33, 0x43, 0xaf, 0x06, 0x46, 0x76 } \
   }
 
 
diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.h b/IntelUndiPkg/XGigUndiDxe/StartStop.h
index 03ad3dc9cecc..5dfc45c7de6a 100644
--- a/IntelUndiPkg/XGigUndiDxe/StartStop.h
+++ b/IntelUndiPkg/XGigUndiDxe/StartStop.h
@@ -32,8 +32,8 @@  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Xgbe.h"
 
 #define EFI_DRIVER_STOP_PROTOCOL_GUID \
-  { 0x34d59603, 0x1428, 0x4429, 0xa4, 0x14, 0xe6, 0xb3, \
-    0xb5, 0xfd, 0x7d, 0xc1 }
+  { 0x34d59603, 0x1428, 0x4429, { 0xa4, 0x14, 0xe6, 0xb3, \
+    0xb5, 0xfd, 0x7d, 0xc1 } }
 
 typedef struct EFI_DRIVER_STOP_PROTOCOL_S  EFI_DRIVER_STOP_PROTOCOL;