diff options
author | Rebecca Cran <rebecca@bsdio.com> | 2023-04-06 13:45:15 -0600 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-04-10 14:19:57 +0000 |
commit | f2cc962cd28fe75fb4edf230d69e99c346fe9c8a (patch) | |
tree | 5313e3d9b561073d896d86beaecc91f835d5fece /ArmPkg/Library/PlatformBootManagerLib | |
parent | cf4af503fb61e7a942e05e61627364cad48c5781 (diff) | |
download | edk2-f2cc962cd28fe75fb4edf230d69e99c346fe9c8a.tar.gz edk2-f2cc962cd28fe75fb4edf230d69e99c346fe9c8a.tar.bz2 edk2-f2cc962cd28fe75fb4edf230d69e99c346fe9c8a.zip |
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>
Diffstat (limited to 'ArmPkg/Library/PlatformBootManagerLib')
-rw-r--r-- | ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 2fb1a4aa4f..08998ffe4d 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -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);
}
|