From 63e78d5254338fe4b622e3037d1291af9dcb6198 Mon Sep 17 00:00:00 2001
From: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Sat, 4 Jun 2011 22:27:37 +0000
Subject: [PATCH] Fix X64 clang warnings.

Reviewed by: Rui Sun
Approved by: Rui Sun



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11753 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c             |  2 +-
 MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c        |  2 +-
 .../Universal/Console/ConSplitterDxe/ConSplitter.c   |  8 ++++----
 MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c  | 12 +++++++-----
 .../Network/IScsiDxe/IScsiExtScsiPassThru.c          |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
index cb892e3ebc..55fe5c873c 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
@@ -359,7 +359,7 @@ UsbParseConfigDesc (
   while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) {
     Setting = UsbParseInterfaceDesc (DescBuf, Len, &Consumed);
 
-    if ((Setting == NULL)) {
+    if (Setting == NULL) {
       DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: failed to parse interface setting\n"));
       goto ON_ERROR;
 
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 13dff912ad..edec580b1f 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -779,7 +779,7 @@ PeiDispatcher (
                          );
             }
 
-            if ((Status == EFI_SUCCESS)) {
+            if (Status == EFI_SUCCESS) {
               //
               // The PEIM has its dependencies satisfied, and its entry point
               // has been found, so invoke it.
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 92d677d2c1..57704d878e 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -1865,7 +1865,7 @@ ConSplitterTextInDeleteDevice (
   //
   for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) {
     if (Private->TextInList[Index] == TextIn) {
-      for (Index = Index; Index < Private->CurrentNumberOfConsoles - 1; Index++) {
+      for (; Index < Private->CurrentNumberOfConsoles - 1; Index++) {
         Private->TextInList[Index] = Private->TextInList[Index + 1];
       }
 
@@ -1945,7 +1945,7 @@ ConSplitterTextInExDeleteDevice (
   //
   for (Index = 0; Index < Private->CurrentNumberOfExConsoles; Index++) {
     if (Private->TextInExList[Index] == TextInEx) {
-      for (Index = Index; Index < Private->CurrentNumberOfExConsoles - 1; Index++) {
+      for (; Index < Private->CurrentNumberOfExConsoles - 1; Index++) {
         Private->TextInExList[Index] = Private->TextInExList[Index + 1];
       }
 
@@ -2022,7 +2022,7 @@ ConSplitterSimplePointerDeleteDevice (
   //
   for (Index = 0; Index < Private->CurrentNumberOfPointers; Index++) {
     if (Private->PointerList[Index] == SimplePointer) {
-      for (Index = Index; Index < Private->CurrentNumberOfPointers - 1; Index++) {
+      for (; Index < Private->CurrentNumberOfPointers - 1; Index++) {
         Private->PointerList[Index] = Private->PointerList[Index + 1];
       }
 
@@ -2099,7 +2099,7 @@ ConSplitterAbsolutePointerDeleteDevice (
   //
   for (Index = 0; Index < Private->CurrentNumberOfAbsolutePointers; Index++) {
     if (Private->AbsolutePointerList[Index] == AbsolutePointer) {
-      for (Index = Index; Index < Private->CurrentNumberOfAbsolutePointers - 1; Index++) {
+      for (; Index < Private->CurrentNumberOfAbsolutePointers - 1; Index++) {
         Private->AbsolutePointerList[Index] = Private->AbsolutePointerList[Index + 1];
       }
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index 2d5f659d35..79e70934e6 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -235,7 +235,7 @@ IScsiDhcpSelectOffer (
     break;
   }
 
-  if ((Index == OptionCount)) {
+  if (Index == OptionCount) {
     Status = EFI_NOT_READY;
   }
 
@@ -361,6 +361,7 @@ IScsiDoDhcp (
   EFI_DHCP4_PACKET_OPTION *ParaList;
   EFI_DHCP4_CONFIG_DATA   Dhcp4ConfigData;
   BOOLEAN                 MediaPresent;
+  UINT8                   *Data;
 
   Dhcp4Handle = NULL;
   Dhcp4       = NULL;
@@ -410,10 +411,11 @@ IScsiDoDhcp (
   //
   ParaList->OpCode  = DHCP4_TAG_PARA_LIST;
   ParaList->Length  = (UINT8) (ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3);
-  ParaList->Data[0] = DHCP4_TAG_NETMASK;
-  ParaList->Data[1] = DHCP4_TAG_ROUTER;
-  ParaList->Data[2] = DHCP4_TAG_DNS;
-  ParaList->Data[3] = DHCP4_TAG_ROOT_PATH;
+  Data = &ParaList->Data[0];
+  Data[0] = DHCP4_TAG_NETMASK;
+  Data[1] = DHCP4_TAG_ROUTER;
+  Data[2] = DHCP4_TAG_DNS;
+  Data[3] = DHCP4_TAG_ROOT_PATH;
 
   ZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA));
   Dhcp4ConfigData.OptionCount = 1;
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index 0b17c7e1d8..dea7f7cb95 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
@@ -183,7 +183,7 @@ IScsiExtScsiPassThruBuildDevicePath (
   EFI_DEV_PATH                  *Node;
   UINTN                         DevPathNodeLen;
 
-  if ((DevicePath == NULL)) {
+  if (DevicePath == NULL) {
     return EFI_INVALID_PARAMETER;
   }
 
-- 
2.39.2