зеркало из https://github.com/microsoft/mu_plus.git
Merged PR 5989: Fix DEBUG macro errors in repo
## Description
Builds upon the changes done in 5ce890ef
to fix additional DEBUG
macro errors found in this repo.
- [ ] Breaking change?
- Will this change break pre-existing builds or functionality without action being taken?
**No**
## How This Was Tested
Verified repo package results with DebugMacroCheck as of the version
checked into mu_basecore at c4183eff.
## Integration Instructions
None - This is done to prepare for DebugMacroCheck integration in this repo.
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
This commit is contained in:
Родитель
7f74fbf769
Коммит
c2a6bc7e36
|
@ -88,7 +88,7 @@ FormatTimeStamp (
|
|||
/**
|
||||
Get Next Message Block.
|
||||
|
||||
Get the next content of a DEBUG(()) message from the in memory buffer.
|
||||
Get the next content of a message from the in memory buffer.
|
||||
|
||||
When the CurrentMessage structure is initialized to NULL, the first message is returned. While
|
||||
not expected during normal use, to start reading from the beginning of the log again, set the
|
||||
|
@ -171,7 +171,7 @@ AdvancedLoggerAccessLibGetNextMessageBlock (
|
|||
/**
|
||||
Get Next Formatted line.
|
||||
|
||||
Get the next set of DEBUG(()) output characters up to and including the next \n. The
|
||||
Get the next set of output characters up to and including the next \n. The
|
||||
message is formatted with a time stamp.
|
||||
|
||||
When the LineEntry structure is initialized to NULL, the first message is returned. Each
|
||||
|
|
|
@ -58,7 +58,7 @@ DfciConvertToCHAR16 (
|
|||
|
||||
Status = AsciiStrToUnicodeStrS (Text8, WideString, WideStringLen);
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((DEBUG_ERROR, "Unable to convert Ascii to Unicode. Code=%r\n"));
|
||||
DEBUG ((DEBUG_ERROR, "Unable to convert Ascii to Unicode. Code=%r\n", Status));
|
||||
FreePool (WideString);
|
||||
return Status;
|
||||
}
|
||||
|
|
|
@ -203,7 +203,7 @@ LoadProvisionedData (
|
|||
}
|
||||
default:
|
||||
MaxCertsAllowed = 0;
|
||||
DEBUG ((DEBUG_INFO, "Auth Manager Internal Var Version not recognized (%d).\n"));
|
||||
DEBUG ((DEBUG_INFO, "Auth Manager Internal Var Version not recognized (%d).\n", Var->HeaderVersion));
|
||||
Status = EFI_INCOMPATIBLE_VERSION;
|
||||
goto CLEANUP;
|
||||
break;
|
||||
|
|
|
@ -56,7 +56,7 @@ InternalSystemSettingAccessSet (
|
|||
|
||||
if (prov == NULL) {
|
||||
if (SetRecurse) {
|
||||
DEBUG ((DEBUG_ERROR, "%a: Unexpected recursion.\n"));
|
||||
DEBUG ((DEBUG_ERROR, "%a: Unexpected recursion.\n", __FUNCTION__));
|
||||
ASSERT (!SetRecurse);
|
||||
return EFI_UNSUPPORTED;
|
||||
}
|
||||
|
@ -134,7 +134,7 @@ InternalSystemSettingAccessSet (
|
|||
);
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((DEBUG_ERROR, "DfciSettingChangedNotification returned error code=%r\n"));
|
||||
DEBUG ((DEBUG_ERROR, "DfciSettingChangedNotification returned error code=%r\n", Status));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -230,7 +230,7 @@ InternalSystemSettingAccessGet (
|
|||
|
||||
if (prov == NULL) {
|
||||
if (GetRecurse) {
|
||||
DEBUG ((DEBUG_ERROR, "%a: Unexpected recursion.\n"));
|
||||
DEBUG ((DEBUG_ERROR, "%a: Unexpected recursion.\n", __FUNCTION__));
|
||||
ASSERT (!GetRecurse);
|
||||
return EFI_UNSUPPORTED;
|
||||
}
|
||||
|
|
|
@ -986,7 +986,7 @@ InternalGetPersistedCapsuleData (
|
|||
// read in the file from the disk
|
||||
Status = File->Read (File, &CapsuleSize, CapsuleData);
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((DEBUG_ERROR, "[%a] - Failed to read capsule file\n"));
|
||||
DEBUG ((DEBUG_ERROR, "[%a] - Failed to read capsule file\n", __FUNCTION__));
|
||||
goto Cleanup;
|
||||
}
|
||||
|
||||
|
|
|
@ -1067,7 +1067,8 @@ ExtractConfig (
|
|||
DEBUG ((
|
||||
DEBUG_INFO,
|
||||
"%a: Request=%s\n",
|
||||
__FUNCTION__
|
||||
__FUNCTION__,
|
||||
Request
|
||||
));
|
||||
|
||||
DEBUG ((
|
||||
|
|
|
@ -188,7 +188,7 @@ MsPreBootChecks (
|
|||
|
||||
Status = SystemPowerMitigate (PowerCaseBoot);
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((DEBUG_INFO, "SystemPowerMitigate(Boot) failed - %r. Shutdown now\n"));
|
||||
DEBUG ((DEBUG_INFO, "SystemPowerMitigate(Boot) failed - %r. Shutdown now\n", Status));
|
||||
|
||||
PowerGood = FALSE;
|
||||
goto CleanUp;
|
||||
|
|
|
@ -16,3 +16,4 @@ edk2-pytool-library~=0.11.0
|
|||
edk2-pytool-extensions~=0.17.1
|
||||
edk2-basetools==0.1.13
|
||||
antlr4-python3-runtime==4.7.1
|
||||
regex
|
||||
|
|
Загрузка…
Ссылка в новой задаче