[edk2] [Patch] NetworkPkg: Update IScsiDxe to pass XCODE build

Liming Gao posted 1 patch 6 years, 4 months ago
Failed in applying to current master (apply log)
NetworkPkg/IScsiDxe/IScsiDhcp.c            | 2 +-
NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[edk2] [Patch] NetworkPkg: Update IScsiDxe to pass XCODE build
Posted by Liming Gao 6 years, 4 months ago
Fix the warning equality comparison with extraneous parentheses
[-Werror,-Wparentheses-equality].

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liang Vincent <vincent.liang@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiDhcp.c            | 2 +-
 NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp.c b/NetworkPkg/IScsiDxe/IScsiDhcp.c
index 6587a05..309ce0d 100644
--- a/NetworkPkg/IScsiDxe/IScsiDhcp.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp.c
@@ -266,7 +266,7 @@ IScsiDhcpSelectOffer (
     break;
   }
 
-  if ((Index == OptionCount)) {
+  if (Index == OptionCount) {
     Status = EFI_NOT_READY;
   }
 
diff --git a/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c b/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
index f971244..90e26d4 100644
--- a/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
+++ b/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
@@ -1,7 +1,7 @@
 /** @file
   The implementation of EFI_EXT_SCSI_PASS_THRU_PROTOCOL.
 
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2017, 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
@@ -219,7 +219,7 @@ IScsiExtScsiPassThruBuildDevicePath (
   EFI_DEV_PATH                  *Node;
   UINTN                         DevPathNodeLen;
 
-  if ((DevicePath == NULL)) {
+  if (DevicePath == NULL) {
     return EFI_INVALID_PARAMETER;
   }
 
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] NetworkPkg: Update IScsiDxe to pass XCODE build
Posted by Wu, Jiaxin 6 years, 4 months ago
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>

Thanks,
Jiaxin

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Liming Gao
> Sent: Tuesday, November 28, 2017 11:19 AM
> To: edk2-devel@lists.01.org
> Cc: Liang, Vincent <vincent.liang@intel.com>
> Subject: [edk2] [Patch] NetworkPkg: Update IScsiDxe to pass XCODE build
> 
> Fix the warning equality comparison with extraneous parentheses
> [-Werror,-Wparentheses-equality].
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liang Vincent <vincent.liang@intel.com>
> ---
>  NetworkPkg/IScsiDxe/IScsiDhcp.c            | 2 +-
>  NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp.c
> b/NetworkPkg/IScsiDxe/IScsiDhcp.c
> index 6587a05..309ce0d 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDhcp.c
> +++ b/NetworkPkg/IScsiDxe/IScsiDhcp.c
> @@ -266,7 +266,7 @@ IScsiDhcpSelectOffer (
>      break;
>    }
> 
> -  if ((Index == OptionCount)) {
> +  if (Index == OptionCount) {
>      Status = EFI_NOT_READY;
>    }
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
> b/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
> index f971244..90e26d4 100644
> --- a/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
> +++ b/NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
> @@ -1,7 +1,7 @@
>  /** @file
>    The implementation of EFI_EXT_SCSI_PASS_THRU_PROTOCOL.
> 
> -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2004 - 2017, 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
> @@ -219,7 +219,7 @@ IScsiExtScsiPassThruBuildDevicePath (
>    EFI_DEV_PATH                  *Node;
>    UINTN                         DevPathNodeLen;
> 
> -  if ((DevicePath == NULL)) {
> +  if (DevicePath == NULL) {
>      return EFI_INVALID_PARAMETER;
>    }
> 
> --
> 2.8.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel