1. Edk2 | Devel
  2. Topics

[PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv

Chao Li
 

If operation Werro is turned on when compiling BaseTools, the
multi-brackets warning will be reported. This issue is comes from on of
the LoongArch enabled patche. Removed extra pairs brackets to fix it.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4111

Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Cc: Yuwei Chen <yuwei.chen@...>
Signed-off-by: Chao Li <lichao@...>
---
BaseTools/Source/C/GenFv/GenFvInternalLib.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source=
/C/GenFv/GenFvInternalLib.c
index 5c3d54f5f7..b5b9425003 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -3559,7 +3559,7 @@ Returns:
}=0D
=0D
// Machine type is LOONGARCH64, set a flag so LoongArch64 reset vect=
or processed.=0D
- if ((MachineType =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64)) {=0D
+ if (MachineType =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) {=0D
VerboseMsg("Located LoongArch64 SEC core in child FV");=0D
mLoongArch =3D TRUE;=0D
}=0D
@@ -3721,7 +3721,7 @@ Returns:
mRiscV =3D TRUE;=0D
}=0D
=0D
- if ( (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) ) {=0D
+ if (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) {=0D
mLoongArch =3D TRUE;=0D
}=0D
=0D
@@ -4002,7 +4002,7 @@ Returns:
mArm =3D TRUE;=0D
}=0D
=0D
- if ( (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) ) {=0D
+ if (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_LOONGARCH64) {=0D
mLoongArch =3D TRUE;=0D
}=0D
=0D
--=20
2.27.0
Bob Feng
 

Reviewed-by: Bob Feng <bob.c.feng@...>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Chao Li
Sent: Thursday, October 20, 2022 5:25 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@...>; Gao, Liming <gaoliming@...>; Chen, Christine <yuwei.chen@...>
Subject: [edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv

If operation Werro is turned on when compiling BaseTools, the multi-brackets warning will be reported. This issue is comes from on of the LoongArch enabled patche. Removed extra pairs brackets to fix it.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4111

Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Cc: Yuwei Chen <yuwei.chen@...>
Signed-off-by: Chao Li <lichao@...>
---
BaseTools/Source/C/GenFv/GenFvInternalLib.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 5c3d54f5f7..b5b9425003 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -3559,7 +3559,7 @@ Returns:
} // Machine type is LOONGARCH64, set a flag so LoongArch64 reset vector processed.- if ((MachineType == EFI_IMAGE_MACHINE_LOONGARCH64)) {+ if (MachineType == EFI_IMAGE_MACHINE_LOONGARCH64) { VerboseMsg("Located LoongArch64 SEC core in child FV"); mLoongArch = TRUE; }@@ -3721,7 +3721,7 @@ Returns:
mRiscV = TRUE; } - if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) ) {+ if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) { mLoongArch = TRUE; } @@ -4002,7 +4002,7 @@ Returns:
mArm = TRUE; } - if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) ) {+ if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) { mLoongArch = TRUE; } --
2.27.0



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95422): https://edk2.groups.io/g/devel/message/95422
Mute This Topic: https://groups.io/mt/94450039/1768742
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@...] -=-=-=-=-=-=

1 - 2 of 2