tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPkg: Update code to be more C11 compliant by using __func__ 

__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.

Since it's more standard, replace __FUNCTION__ with __func__ throughout
ArmPkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Rebecca Cran 2023-04-06 13:45:15 -06:00 committed by mergify[bot]
parent cf4af503fb
commit f2cc962cd2
13 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c
View File

@ -137,7 +137,7 @@ CpuArchEventProtocolNotify (
DEBUG ((
DEBUG_ERROR,
"%a: Cpu->RegisterInterruptHandler() - %r\n",
__FUNCTION__,
__func__,
Status
));
return;
@ -153,7 +153,7 @@ CpuArchEventProtocolNotify (
DEBUG ((
DEBUG_ERROR,
"%a: Cpu->RegisterInterruptHandler() - %r\n",
__FUNCTION__,
__func__,
Status
));
}

10
ArmPkg/Drivers/CpuDxe/MemoryAttribute.c
View File

@ -92,7 +92,7 @@ GetMemoryAttributes (
DEBUG ((
DEBUG_VERBOSE,
"%a: BaseAddress == 0x%lx, Length == 0x%lx\n",
__FUNCTION__,
__func__,
BaseAddress,
Length
));
@ -113,7 +113,7 @@ GetMemoryAttributes (
DEBUG ((
DEBUG_VERBOSE,
"%a: RegionAddress == 0x%lx, RegionLength == 0x%lx, RegionAttributes == 0x%lx\n",
__FUNCTION__,
__func__,
(UINT64)RegionAddress,
(UINT64)RegionLength,
(UINT64)RegionAttributes
@ -130,7 +130,7 @@ GetMemoryAttributes (
DEBUG ((
DEBUG_VERBOSE,
"%a: Union == %lx, Intersection == %lx\n",
__FUNCTION__,
__func__,
(UINT64)Union,
(UINT64)Intersection
));
@ -188,7 +188,7 @@ SetMemoryAttributes (
DEBUG ((
DEBUG_INFO,
"%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
__FUNCTION__,
__func__,
(UINTN)BaseAddress,
(UINTN)Length,
(UINTN)Attributes
@ -272,7 +272,7 @@ ClearMemoryAttributes (
DEBUG ((
DEBUG_INFO,
"%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
__FUNCTION__,
__func__,
(UINTN)BaseAddress,
(UINTN)Length,
(UINTN)Attributes

4
ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
View File

@ -139,7 +139,7 @@ ReplaceTableEntry (
(((RegionStart ^ (UINTN)Entry) & ~BlockMask) == 0))
{
DisableMmu = TRUE;
DEBUG ((DEBUG_WARN, "%a: splitting block entry with MMU disabled\n", __FUNCTION__));
DEBUG ((DEBUG_WARN, "%a: splitting block entry with MMU disabled\n", __func__));
}
mReplaceLiveEntryFunc (Entry, Value, RegionStart, DisableMmu);
@ -233,7 +233,7 @@ UpdateRegionMappingRecursive (
DEBUG ((
DEBUG_VERBOSE,
"%a(%d): %llx - %llx set %lx clr %lx\n",
__FUNCTION__,
__func__,
Level,
RegionStart,
RegionEnd,

2
ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
View File

@ -65,7 +65,7 @@ LibResetSystem (
ArmCallSmc (&ArmSmcArgs);
// We should never be here
DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __func__));
CpuDeadLoop ();
return EFI_UNSUPPORTED;
}

2
ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBm.c
View File

@ -151,7 +151,7 @@ PlatformBootManagerAfterConsole (
LOAD_OPTION_ACTIVE
);
} else {
DEBUG ((DEBUG_ERROR, "%a: PcdLinuxBootFileGuid was not set!\n", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: PcdLinuxBootFileGuid was not set!\n", __func__));
}
}

32
ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
View File

@ -195,7 +195,7 @@ FilterAndProcess (
DEBUG ((
DEBUG_VERBOSE,
"%a: %g: %r\n",
__FUNCTION__,
__func__,
ProtocolGuid,
Status
));
@ -266,7 +266,7 @@ IsPciDisplay (
&Pci
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status));
return FALSE;
}
@ -330,7 +330,7 @@ Connect (
DEBUG ((
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
"%a: %s: %r\n",
__FUNCTION__,
__func__,
ReportText,
Status
));
@ -356,7 +356,7 @@ AddOutput (
DEBUG ((
DEBUG_ERROR,
"%a: %s: handle %p: device path not found\n",
__FUNCTION__,
__func__,
ReportText,
Handle
));
@ -368,7 +368,7 @@ AddOutput (
DEBUG ((
DEBUG_ERROR,
"%a: %s: adding to ConOut: %r\n",
__FUNCTION__,
__func__,
ReportText,
Status
));
@ -380,7 +380,7 @@ AddOutput (
DEBUG ((
DEBUG_ERROR,
"%a: %s: adding to ErrOut: %r\n",
__FUNCTION__,
__func__,
ReportText,
Status
));
@ -390,7 +390,7 @@ AddOutput (
DEBUG ((
DEBUG_VERBOSE,
"%a: %s: added to ConOut and ErrOut\n",
__FUNCTION__,
__func__,
ReportText
));
}
@ -547,7 +547,7 @@ GetPlatformOptions (
DEBUG ((
DEBUG_ERROR,
"%a: failed to register \"%s\": %r\n",
__FUNCTION__,
__func__,
BootOptions[Index].Description,
Status
));
@ -575,7 +575,7 @@ GetPlatformOptions (
DEBUG ((
DEBUG_ERROR,
"%a: failed to register hotkey for \"%s\": %r\n",
__FUNCTION__,
__func__,
BootOptions[Index].Description,
Status
));
@ -757,7 +757,7 @@ HandleCapsules (
BOOLEAN NeedReset;
EFI_STATUS Status;
DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __func__));
Status = gBS->LocateProtocol (
&gEsrtManagementProtocolGuid,
@ -785,7 +785,7 @@ HandleCapsules (
DEBUG ((
DEBUG_ERROR,
"%a: failed to process capsule %p - %r\n",
__FUNCTION__,
__func__,
CapsuleHeader,
Status
));
@ -800,7 +800,7 @@ HandleCapsules (
DEBUG ((
DEBUG_WARN,
"%a: capsule update successful, resetting ...\n",
__FUNCTION__
__func__
));
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
@ -868,7 +868,7 @@ BootDiscoveryPolicyHandler (
DEBUG ((
DEBUG_INFO,
"%a - Unexpected DiscoveryPolicy (0x%x). Run Minimal Discovery Policy\n",
__FUNCTION__,
__func__,
DiscoveryPolicy
));
return EFI_SUCCESS;
@ -884,14 +884,14 @@ BootDiscoveryPolicyHandler (
DEBUG_INFO,
"%a - Failed to locate gEfiBootManagerPolicyProtocolGuid."
"Driver connect will be skipped.\n",
__FUNCTION__
__func__
));
return Status;
}
Status = BMPolicy->ConnectDeviceClass (BMPolicy, Class);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __FUNCTION__, Status));
DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __func__, Status));
return Status;
}
@ -1096,7 +1096,7 @@ PlatformBootManagerUnableToBoot (
DEBUG ((
DEBUG_WARN,
"%a: rebooting after refreshing all boot options\n",
__FUNCTION__
__func__
));
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
}

2
ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
View File

@ -741,7 +741,7 @@ AddSmbiosProcessorTypeTable (
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));

2
ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
View File

@ -287,7 +287,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) {
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));

2
ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
View File

@ -184,7 +184,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscSystemManufacturer) {
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));

2
ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
View File

@ -214,7 +214,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBaseBoardManufacturer) {
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));

2
ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
View File

@ -179,7 +179,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscChassisManufacturer) {
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));

2
ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
View File

@ -161,7 +161,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscNumberOfInstallableLanguages) {
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));

2
ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
View File

@ -69,7 +69,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBootInformation) {
DEBUG ((
DEBUG_ERROR,
"[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n",
__FUNCTION__,
__func__,
DEBUG_LINE_NUMBER,
Status
));