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>
This commit is contained in:
@ -1,7 +1,7 @@
|
|||||||
/** @file
|
/** @file
|
||||||
Provides interface to advanced shell functionality for parsing both handle and protocol database.
|
Provides interface to advanced shell functionality for parsing both handle and protocol database.
|
||||||
|
|
||||||
Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
|
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
|
||||||
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
|
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
|
||||||
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
|
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
|
||||||
This program and the accompanying materials
|
This program and the accompanying materials
|
||||||
@ -1042,27 +1042,27 @@ FirmwareManagementDumpInformation (
|
|||||||
} else {
|
} else {
|
||||||
AttributeSettingStr = CatSPrint (NULL, L"(");
|
AttributeSettingStr = CatSPrint (NULL, L"(");
|
||||||
|
|
||||||
if (AttributeSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE) {
|
if ((AttributeSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE) != 0x0) {
|
||||||
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_IMAGE_UPDATABLE");
|
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_IMAGE_UPDATABLE");
|
||||||
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
||||||
AttributeSettingStr = TempRetVal;
|
AttributeSettingStr = TempRetVal;
|
||||||
}
|
}
|
||||||
if (AttributeSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED) {
|
if ((AttributeSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED) != 0x0) {
|
||||||
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_RESET_REQUIRED");
|
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_RESET_REQUIRED");
|
||||||
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
||||||
AttributeSettingStr = TempRetVal;
|
AttributeSettingStr = TempRetVal;
|
||||||
}
|
}
|
||||||
if (AttributeSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED) {
|
if ((AttributeSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED) != 0x0) {
|
||||||
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED");
|
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED");
|
||||||
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
||||||
AttributeSettingStr = TempRetVal;
|
AttributeSettingStr = TempRetVal;
|
||||||
}
|
}
|
||||||
if (AttributeSetting & IMAGE_ATTRIBUTE_IN_USE) {
|
if ((AttributeSetting & IMAGE_ATTRIBUTE_IN_USE) != 0x0) {
|
||||||
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_IN_USE");
|
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_IN_USE");
|
||||||
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
||||||
AttributeSettingStr = TempRetVal;
|
AttributeSettingStr = TempRetVal;
|
||||||
}
|
}
|
||||||
if (AttributeSetting & IMAGE_ATTRIBUTE_UEFI_IMAGE) {
|
if ((AttributeSetting & IMAGE_ATTRIBUTE_UEFI_IMAGE) != 0x0) {
|
||||||
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_UEFI_IMAGE");
|
TempRetVal = CatSPrint (AttributeSettingStr, L" IMAGE_ATTRIBUTE_UEFI_IMAGE");
|
||||||
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
SHELL_FREE_NON_NULL (AttributeSettingStr);
|
||||||
AttributeSettingStr = TempRetVal;
|
AttributeSettingStr = TempRetVal;
|
||||||
@ -1198,7 +1198,7 @@ ENDLOOP:
|
|||||||
//
|
//
|
||||||
// Check if ImageId with duplicate value was found
|
// Check if ImageId with duplicate value was found
|
||||||
//
|
//
|
||||||
if (Found == TRUE) {
|
if (Found) {
|
||||||
TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_FMP_IMAGEID_NON_UNIQUE), NULL);
|
TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_FMP_IMAGEID_NON_UNIQUE), NULL);
|
||||||
if (TempStr == NULL) {
|
if (TempStr == NULL) {
|
||||||
goto ERROR_EXIT;
|
goto ERROR_EXIT;
|
||||||
|
Reference in New Issue
Block a user