ShellPkg: Refine the comparisons code in ShellPkg.

For Boolean values not use explicit comparisons to TRUE or FALSE. For non-Boolean
comparisons we should use a compare operator.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 48a753dfd5cb6b1986789e0a653155b2aafd5fd8..14e7a9fa45ed6ea619060eca3be6444663cb8d71 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides interface to advanced shell functionality for parsing both handle and protocol database.\r
 \r
-  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
   (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
@@ -1042,27 +1042,27 @@ FirmwareManagementDumpInformation (
       } else {\r
         AttributeSettingStr = CatSPrint (NULL, L"(");\r
 \r
-        if (AttributeSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE) {\r
+        if ((AttributeSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE) != 0x0) {\r
           TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_IMAGE_UPDATABLE");\r
           SHELL_FREE_NON_NULL (AttributeSettingStr);\r
           AttributeSettingStr = TempRetVal;\r
         }\r
-        if (AttributeSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED) {\r
+        if ((AttributeSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED) != 0x0) {\r
           TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_RESET_REQUIRED");\r
           SHELL_FREE_NON_NULL (AttributeSettingStr);\r
           AttributeSettingStr = TempRetVal;\r
         }\r
-        if (AttributeSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED) {\r
+        if ((AttributeSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED) != 0x0) {\r
           TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED");\r
           SHELL_FREE_NON_NULL (AttributeSettingStr);\r
           AttributeSettingStr = TempRetVal;\r
         }\r
-        if (AttributeSetting & IMAGE_ATTRIBUTE_IN_USE) {\r
+        if ((AttributeSetting & IMAGE_ATTRIBUTE_IN_USE) != 0x0) {\r
           TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_IN_USE");\r
           SHELL_FREE_NON_NULL (AttributeSettingStr);\r
           AttributeSettingStr = TempRetVal;\r
         }\r
-        if (AttributeSetting & IMAGE_ATTRIBUTE_UEFI_IMAGE) {\r
+        if ((AttributeSetting & IMAGE_ATTRIBUTE_UEFI_IMAGE) != 0x0) {\r
           TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_UEFI_IMAGE");\r
           SHELL_FREE_NON_NULL (AttributeSettingStr);\r
           AttributeSettingStr = TempRetVal;\r
@@ -1198,7 +1198,7 @@ ENDLOOP:
   //\r
   // Check if ImageId with duplicate value was found\r
   //\r
-  if (Found == TRUE) {\r
+  if (Found) {\r
     TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_FMP_IMAGEID_NON_UNIQUE), NULL);\r
     if (TempStr == NULL) {\r
       goto ERROR_EXIT;\r