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
This commit is contained in:
andrewfish 2011-06-04 22:27:37 +00:00
parent ae69c04736
commit 63e78d5254
5 changed files with 14 additions and 12 deletions

View File

@ -359,7 +359,7 @@ UsbParseConfigDesc (
while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) { while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) {
Setting = UsbParseInterfaceDesc (DescBuf, Len, &Consumed); Setting = UsbParseInterfaceDesc (DescBuf, Len, &Consumed);
if ((Setting == NULL)) { if (Setting == NULL) {
DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: failed to parse interface setting\n")); DEBUG (( EFI_D_ERROR, "UsbParseConfigDesc: failed to parse interface setting\n"));
goto ON_ERROR; goto ON_ERROR;

View File

@ -779,7 +779,7 @@ PeiDispatcher (
); );
} }
if ((Status == EFI_SUCCESS)) { if (Status == EFI_SUCCESS) {
// //
// The PEIM has its dependencies satisfied, and its entry point // The PEIM has its dependencies satisfied, and its entry point
// has been found, so invoke it. // has been found, so invoke it.

View File

@ -1865,7 +1865,7 @@ ConSplitterTextInDeleteDevice (
// //
for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) { for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) {
if (Private->TextInList[Index] == TextIn) { 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]; Private->TextInList[Index] = Private->TextInList[Index + 1];
} }
@ -1945,7 +1945,7 @@ ConSplitterTextInExDeleteDevice (
// //
for (Index = 0; Index < Private->CurrentNumberOfExConsoles; Index++) { for (Index = 0; Index < Private->CurrentNumberOfExConsoles; Index++) {
if (Private->TextInExList[Index] == TextInEx) { 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]; Private->TextInExList[Index] = Private->TextInExList[Index + 1];
} }
@ -2022,7 +2022,7 @@ ConSplitterSimplePointerDeleteDevice (
// //
for (Index = 0; Index < Private->CurrentNumberOfPointers; Index++) { for (Index = 0; Index < Private->CurrentNumberOfPointers; Index++) {
if (Private->PointerList[Index] == SimplePointer) { 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]; Private->PointerList[Index] = Private->PointerList[Index + 1];
} }
@ -2099,7 +2099,7 @@ ConSplitterAbsolutePointerDeleteDevice (
// //
for (Index = 0; Index < Private->CurrentNumberOfAbsolutePointers; Index++) { for (Index = 0; Index < Private->CurrentNumberOfAbsolutePointers; Index++) {
if (Private->AbsolutePointerList[Index] == AbsolutePointer) { 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]; Private->AbsolutePointerList[Index] = Private->AbsolutePointerList[Index + 1];
} }

View File

@ -235,7 +235,7 @@ IScsiDhcpSelectOffer (
break; break;
} }
if ((Index == OptionCount)) { if (Index == OptionCount) {
Status = EFI_NOT_READY; Status = EFI_NOT_READY;
} }
@ -361,6 +361,7 @@ IScsiDoDhcp (
EFI_DHCP4_PACKET_OPTION *ParaList; EFI_DHCP4_PACKET_OPTION *ParaList;
EFI_DHCP4_CONFIG_DATA Dhcp4ConfigData; EFI_DHCP4_CONFIG_DATA Dhcp4ConfigData;
BOOLEAN MediaPresent; BOOLEAN MediaPresent;
UINT8 *Data;
Dhcp4Handle = NULL; Dhcp4Handle = NULL;
Dhcp4 = NULL; Dhcp4 = NULL;
@ -410,10 +411,11 @@ IScsiDoDhcp (
// //
ParaList->OpCode = DHCP4_TAG_PARA_LIST; ParaList->OpCode = DHCP4_TAG_PARA_LIST;
ParaList->Length = (UINT8) (ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3); ParaList->Length = (UINT8) (ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3);
ParaList->Data[0] = DHCP4_TAG_NETMASK; Data = &ParaList->Data[0];
ParaList->Data[1] = DHCP4_TAG_ROUTER; Data[0] = DHCP4_TAG_NETMASK;
ParaList->Data[2] = DHCP4_TAG_DNS; Data[1] = DHCP4_TAG_ROUTER;
ParaList->Data[3] = DHCP4_TAG_ROOT_PATH; Data[2] = DHCP4_TAG_DNS;
Data[3] = DHCP4_TAG_ROOT_PATH;
ZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA)); ZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA));
Dhcp4ConfigData.OptionCount = 1; Dhcp4ConfigData.OptionCount = 1;

View File

@ -183,7 +183,7 @@ IScsiExtScsiPassThruBuildDevicePath (
EFI_DEV_PATH *Node; EFI_DEV_PATH *Node;
UINTN DevPathNodeLen; UINTN DevPathNodeLen;
if ((DevicePath == NULL)) { if (DevicePath == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }