From 7ec9caab9293a06129cdeceda40db94f0b37eb9e Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 24 Jun 2009 08:41:14 +0000
Subject: [PATCH] Fix the potential issue that using integrate as BOOLEAN value
 in judgment.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8648 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c                  | 2 +-
 .../Universal/BdsDxe/BootMaint/BmLib.c                    | 2 +-
 .../Universal/BdsDxe/BootMaint/BootOption.c               | 8 ++++----
 .../Universal/BdsDxe/BootMngr/BootManager.c               | 2 +-
 IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index 25aadfe481..098d29f6e0 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -551,7 +551,7 @@ KbdControllerDriverStop (
   //
   // Free other resources
   //
-  if ((ConsoleIn->ConIn).WaitForKey) {
+  if ((ConsoleIn->ConIn).WaitForKey != NULL) {
     gBS->CloseEvent ((ConsoleIn->ConIn).WaitForKey);
     (ConsoleIn->ConIn).WaitForKey = NULL;
   }
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
index aaa64c9458..f575592dbc 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
@@ -337,7 +337,7 @@ EfiDevicePathInstanceCount (
   UINTN Size;
 
   Count = 0;
-  while (GetNextDevicePathInstance (&DevicePath, &Size)) {
+  while (GetNextDevicePathInstance (&DevicePath, &Size) != NULL) {
     Count += 1;
   }
 
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index e9caf5958a..7929f5cbfd 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -586,7 +586,7 @@ BOpt_FindFiles (
     return EFI_NOT_FOUND;
   }
 
-  if (!(DirInfo->Attribute & EFI_FILE_DIRECTORY)) {
+  if ((DirInfo->Attribute & EFI_FILE_DIRECTORY) == 0) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -614,8 +614,8 @@ BOpt_FindFiles (
         break;
       }
 
-      if ((DirInfo->Attribute & EFI_FILE_DIRECTORY && Pass == 2) ||
-          (!(DirInfo->Attribute & EFI_FILE_DIRECTORY) && Pass == 1)
+      if (((DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0 && Pass == 2) ||
+          ((DirInfo->Attribute & EFI_FILE_DIRECTORY) == 0 && Pass == 1)
           ) {
         //
         // Pass 1 is for Directories
@@ -624,7 +624,7 @@ BOpt_FindFiles (
         continue;
       }
 
-      if (!(BOpt_IsEfiImageName (DirInfo->FileName) || DirInfo->Attribute & EFI_FILE_DIRECTORY)) {
+      if (!(BOpt_IsEfiImageName (DirInfo->FileName) || (DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0)) {
         //
         // Slip file unless it is a directory entry or a .EFI file
         //
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index 7a727b8675..0fad88ed48 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -259,7 +259,7 @@ CallBootManager (
     //
     // Don't display the boot option marked as LOAD_OPTION_HIDDEN
     //
-    if (Option->Attribute & LOAD_OPTION_HIDDEN) {
+    if ((Option->Attribute & LOAD_OPTION_HIDDEN) != 0) {
       continue;
     }
 
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index 72139a8b4d..99c3306ec9 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@@ -349,7 +349,7 @@ HotkeyCallback (
     HotkeyData = &Hotkey->KeyData[Hotkey->WaitingKey];
     if ((KeyData->Key.ScanCode == HotkeyData->Key.ScanCode) &&
        (KeyData->Key.UnicodeChar == HotkeyData->Key.UnicodeChar) &&
-       ((HotkeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) ? (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE)) {
+       (((HotkeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ? (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE)) {
       //
       // Receive an expecting key stroke
       //
-- 
2.39.2