From 7ae9c1ce8f7df4b8a549f7d7ce7f2901ba3a9e8c Mon Sep 17 00:00:00 2001 From: jji4 Date: Fri, 6 Feb 2009 05:48:16 +0000 Subject: [PATCH] Coding style checked git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7458 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/DevicePathDxe/DevicePathFromText.c | 4 ++-- .../Universal/DevicePathDxe/DevicePathToText.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c index f7e7cdfcfb..4dbd49b7e4 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c @@ -2765,7 +2765,7 @@ ConvertTextToDeviceNode ( DeviceNodeStr = StrDuplicate (TextDeviceNode); ASSERT (DeviceNodeStr != NULL); - for (Index = 0; DevPathFromTextTable[Index].Function; Index++) { + for (Index = 0; DevPathFromTextTable[Index].Function != NULL; Index++) { ParamStr = GetParamByNodeName (DeviceNodeStr, DevPathFromTextTable[Index].DevicePathNodeText); if (ParamStr != NULL) { DumpNode = DevPathFromTextTable[Index].Function; @@ -2833,7 +2833,7 @@ ConvertTextToDevicePath ( Str = DevicePathStr; while ((DeviceNodeStr = GetNextDeviceNodeStr (&Str, &IsInstanceEnd)) != NULL) { DumpNode = NULL; - for (Index = 0; DevPathFromTextTable[Index].Function; Index++) { + for (Index = 0; DevPathFromTextTable[Index].Function != NULL; Index++) { ParamStr = GetParamByNodeName (DeviceNodeStr, DevPathFromTextTable[Index].DevicePathNodeText); if (ParamStr != NULL) { DumpNode = DevPathFromTextTable[Index].Function; diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c index d45c267ffb..56bd44a76a 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c @@ -555,8 +555,8 @@ DevPathToTextAtapi ( CatPrint ( Str, L"Ata(%s,%s,0x%x)", - Atapi->PrimarySecondary ? L"Secondary" : L"Primary", - Atapi->SlaveMaster ? L"Slave" : L"Master", + (Atapi->PrimarySecondary == 1) ? L"Secondary" : L"Primary", + (Atapi->SlaveMaster == 1) ? L"Slave" : L"Master", Atapi->Lun ); } @@ -1030,8 +1030,8 @@ DevPathToTextIPv4 ( IPDevPath->RemoteIpAddress.Addr[1], IPDevPath->RemoteIpAddress.Addr[2], IPDevPath->RemoteIpAddress.Addr[3], - IPDevPath->Protocol ? L"TCP" : L"UDP", - (IPDevPath->StaticIpAddress == TRUE) ? L"Static" : L"DHCP", + (IPDevPath->Protocol == 1) ? L"TCP" : L"UDP", + IPDevPath->StaticIpAddress ? L"Static" : L"DHCP", IPDevPath->LocalIpAddress.Addr[0], IPDevPath->LocalIpAddress.Addr[1], IPDevPath->LocalIpAddress.Addr[2], @@ -1106,8 +1106,8 @@ DevPathToTextIPv6 ( IPDevPath->RemoteIpAddress.Addr[13], IPDevPath->RemoteIpAddress.Addr[14], IPDevPath->RemoteIpAddress.Addr[15], - IPDevPath->Protocol ? L"TCP" : L"UDP", - (IPDevPath->StaticIpAddress == TRUE) ? L"Static" : L"DHCP", + (IPDevPath->Protocol == 1) ? L"TCP" : L"UDP", + IPDevPath->StaticIpAddress ? L"Static" : L"DHCP", IPDevPath->LocalIpAddress.Addr[0], IPDevPath->LocalIpAddress.Addr[1], IPDevPath->LocalIpAddress.Addr[2], @@ -1769,7 +1769,7 @@ ConvertDevicePathToText ( // Find the handler to dump this device path node // DumpNode = NULL; - for (Index = 0; DevPathToTextTable[Index].Function; Index += 1) { + for (Index = 0; DevPathToTextTable[Index].Function != NULL; Index += 1) { if (DevicePathType (DevPathNode) == DevPathToTextTable[Index].Type && DevicePathSubType (DevPathNode) == DevPathToTextTable[Index].SubType