Re: [edk2] [Patch] BaseTools GenFw: Fix XCODE5 build issue

2019-01-14 Thread Feng, Bob C 
Reviewed-by: Feng Bob C 

-Original Message-
From: Gao, Liming 
Sent: Monday, January 14, 2019 9:52 PM
To: edk2-devel@lists.01.org
Cc: Feng, Bob C 
Subject: [Patch] BaseTools GenFw: Fix XCODE5 build issue

Remove extraneous parentheses around the comparison to silence this warning.
This issue is caused by commit 8daa4278e80c70e6caabc525cd122744488253f5.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao 
Cc: Feng Bob C 
---
 BaseTools/Source/C/GenFw/GenFw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index 37278bbc68..af2c909866 100644
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -1014,7 +1014,7 @@ Returns:
   //
   // Update Image Base Address
   //
-  if ((ImgHdr->Pe32.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
+  if (ImgHdr->Pe32.OptionalHeader.Magic == 
+ EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
 ImgHdr->Pe32.OptionalHeader.ImageBase = (UINT32) NewPe32BaseAddress;
   } else if (ImgHdr->Pe32Plus.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
 ImgHdr->Pe32Plus.OptionalHeader.ImageBase = NewPe32BaseAddress; @@ -2180,7 
+2180,7 @@ Returns:
   // Set new base address into image
   //
   if (mOutImageType == FW_REBASE_IMAGE || mOutImageType == 
FW_SET_ADDRESS_IMAGE) {
-if ((PeHdr->Pe32.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
+if (PeHdr->Pe32.OptionalHeader.Magic == 
+ EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
   if (NewBaseAddress >= 0x1ULL) {
 Error (NULL, 0, 3000, "Invalid", "New base address is larger than 4G 
for 32bit PE image");
 goto Finish;
--
2.13.0.windows.1

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

Re: [edk2] [Patch] BaseTools GenFw: Fix XCODE5 build issue

2019-01-14 Thread Gao, Liming 
Got it. I will update the commit message with the warning message "equality 
comparison with extraneous parentheses".

Thanks
Liming
> -Original Message-
> From: Laszlo Ersek [mailto:ler...@redhat.com]
> Sent: Monday, January 14, 2019 10:36 PM
> To: Gao, Liming ; edk2-devel@lists.01.org
> Subject: Re: [edk2] [Patch] BaseTools GenFw: Fix XCODE5 build issue
> 
> On 01/14/19 14:52, Liming Gao wrote:
> > Remove extraneous parentheses around the comparison to silence this warning.
> 
> Can you please quote the warning message in the commit message? It's
> unclear what warning the commit message refers to. (No need to repost
> just for this.)
> 
> Thanks
> Laszlo
> 
> > This issue is caused by commit 8daa4278e80c70e6caabc525cd122744488253f5.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Liming Gao 
> > Cc: Feng Bob C 
> > ---
> >  BaseTools/Source/C/GenFw/GenFw.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/BaseTools/Source/C/GenFw/GenFw.c 
> > b/BaseTools/Source/C/GenFw/GenFw.c
> > index 37278bbc68..af2c909866 100644
> > --- a/BaseTools/Source/C/GenFw/GenFw.c
> > +++ b/BaseTools/Source/C/GenFw/GenFw.c
> > @@ -1014,7 +1014,7 @@ Returns:
> >//
> >// Update Image Base Address
> >//
> > -  if ((ImgHdr->Pe32.OptionalHeader.Magic == 
> > EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
> > +  if (ImgHdr->Pe32.OptionalHeader.Magic == 
> > EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> >  ImgHdr->Pe32.OptionalHeader.ImageBase = (UINT32) NewPe32BaseAddress;
> >} else if (ImgHdr->Pe32Plus.OptionalHeader.Magic == 
> > EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
> >  ImgHdr->Pe32Plus.OptionalHeader.ImageBase = NewPe32BaseAddress;
> > @@ -2180,7 +2180,7 @@ Returns:
> >// Set new base address into image
> >//
> >if (mOutImageType == FW_REBASE_IMAGE || mOutImageType == 
> > FW_SET_ADDRESS_IMAGE) {
> > -if ((PeHdr->Pe32.OptionalHeader.Magic == 
> > EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
> > +if (PeHdr->Pe32.OptionalHeader.Magic == 
> > EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
> >if (NewBaseAddress >= 0x1ULL) {
> >  Error (NULL, 0, 3000, "Invalid", "New base address is larger than 
> > 4G for 32bit PE image");
> >  goto Finish;
> >

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

Re: [edk2] [Patch] BaseTools GenFw: Fix XCODE5 build issue

2019-01-14 Thread Laszlo Ersek 
On 01/14/19 14:52, Liming Gao wrote:
> Remove extraneous parentheses around the comparison to silence this warning.

Can you please quote the warning message in the commit message? It's
unclear what warning the commit message refers to. (No need to repost
just for this.)

Thanks
Laszlo

> This issue is caused by commit 8daa4278e80c70e6caabc525cd122744488253f5.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao 
> Cc: Feng Bob C 
> ---
>  BaseTools/Source/C/GenFw/GenFw.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/C/GenFw/GenFw.c 
> b/BaseTools/Source/C/GenFw/GenFw.c
> index 37278bbc68..af2c909866 100644
> --- a/BaseTools/Source/C/GenFw/GenFw.c
> +++ b/BaseTools/Source/C/GenFw/GenFw.c
> @@ -1014,7 +1014,7 @@ Returns:
>//
>// Update Image Base Address
>//
> -  if ((ImgHdr->Pe32.OptionalHeader.Magic == 
> EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
> +  if (ImgHdr->Pe32.OptionalHeader.Magic == 
> EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>  ImgHdr->Pe32.OptionalHeader.ImageBase = (UINT32) NewPe32BaseAddress;
>} else if (ImgHdr->Pe32Plus.OptionalHeader.Magic == 
> EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
>  ImgHdr->Pe32Plus.OptionalHeader.ImageBase = NewPe32BaseAddress;
> @@ -2180,7 +2180,7 @@ Returns:
>// Set new base address into image
>//
>if (mOutImageType == FW_REBASE_IMAGE || mOutImageType == 
> FW_SET_ADDRESS_IMAGE) {
> -if ((PeHdr->Pe32.OptionalHeader.Magic == 
> EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
> +if (PeHdr->Pe32.OptionalHeader.Magic == 
> EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
>if (NewBaseAddress >= 0x1ULL) {
>  Error (NULL, 0, 3000, "Invalid", "New base address is larger than 4G 
> for 32bit PE image");
>  goto Finish;
> 

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

[edk2] [Patch] BaseTools GenFw: Fix XCODE5 build issue

2019-01-14 Thread Liming Gao 
Remove extraneous parentheses around the comparison to silence this warning.
This issue is caused by commit 8daa4278e80c70e6caabc525cd122744488253f5.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao 
Cc: Feng Bob C 
---
 BaseTools/Source/C/GenFw/GenFw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index 37278bbc68..af2c909866 100644
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -1014,7 +1014,7 @@ Returns:
   //
   // Update Image Base Address
   //
-  if ((ImgHdr->Pe32.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
+  if (ImgHdr->Pe32.OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
 ImgHdr->Pe32.OptionalHeader.ImageBase = (UINT32) NewPe32BaseAddress;
   } else if (ImgHdr->Pe32Plus.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
 ImgHdr->Pe32Plus.OptionalHeader.ImageBase = NewPe32BaseAddress;
@@ -2180,7 +2180,7 @@ Returns:
   // Set new base address into image
   //
   if (mOutImageType == FW_REBASE_IMAGE || mOutImageType == 
FW_SET_ADDRESS_IMAGE) {
-if ((PeHdr->Pe32.OptionalHeader.Magic == 
EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC)) {
+if (PeHdr->Pe32.OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) 
{
   if (NewBaseAddress >= 0x1ULL) {
 Error (NULL, 0, 3000, "Invalid", "New base address is larger than 4G 
for 32bit PE image");
 goto Finish;
-- 
2.13.0.windows.1

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