sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
__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
RedfishPkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Nickle Wang <nicklew@nvidia.com>
This commit is contained in:
Rebecca Cran
2023-04-06 13:51:09 -06:00
committed by mergify[bot]
parent ccbbb4b1c5
commit 997419d16f
9 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
RedfishPkg/Library/PlatformHostInterfaceBmcUsbNicLib/PlatformHostInterfaceBmcUsbNicLib.c
View File

@@ -37,7 +37,7 @@ ProbeRedfishCredentialBootstrap (
UINT32 ResponseSize;
BOOLEAN ReturnBool;
DEBUG ((DEBUG_INFO, "%a: Entry\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__));
//
// IPMI callout to NetFn 2C, command 02
@@ -65,10 +65,10 @@ ProbeRedfishCredentialBootstrap (
(ResponseData.CompletionCode == REDFISH_IPMI_COMP_CODE_BOOTSTRAP_CREDENTIAL_DISABLED)
))
{
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, " Redfish Credentail Bootstrapping is supported\n", __FUNCTION__));
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, " Redfish Credentail Bootstrapping is supported\n", __func__));
ReturnBool = TRUE;
} else {
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, " Redfish Credentail Bootstrapping is not supported\n", __FUNCTION__));
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, " Redfish Credentail Bootstrapping is not supported\n", __func__));
ReturnBool = FALSE;
}
@@ -94,7 +94,7 @@ RedfishPlatformHostInterfaceDeviceDescriptor (
HOST_INTERFACE_BMC_USB_NIC_INFO *ThisInstance;
REDFISH_INTERFACE_DATA *InterfaceData;
DEBUG ((DEBUG_INFO, "%a: Entry\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__));
if (IsListEmpty (&mBmcUsbNic)) {
return EFI_NOT_FOUND;
@@ -166,7 +166,7 @@ RedfishPlatformHostInterfaceProtocolData (
UINT8 HostNameLength;
CHAR8 *HostNameString;
DEBUG ((DEBUG_INFO, "%a: Entry\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__));
if (IsListEmpty (&mBmcUsbNic) || (IndexOfProtocolData > 0)) {
return EFI_NOT_FOUND;
@@ -300,7 +300,7 @@ RetrievedBmcUsbNicInfo (
IPMI_LAN_VLAN_ID *LanVlanId;
EFI_USB_DEVICE_DESCRIPTOR UsbDeviceDescriptor;
DEBUG ((DEBUG_INFO, "%a: Entry\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__));
if (IsListEmpty (&mBmcUsbNic)) {
return EFI_NOT_FOUND;
@@ -605,7 +605,7 @@ HostInterfaceIpmiCheckMacAddress (
EFI_MAC_ADDRESS IpmiLanChannelMacAddress;
BOOLEAN AlreadyCached;
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __func__));
GetLanConfigReps = NULL;
AlreadyCached = FALSE;
@@ -823,7 +823,7 @@ UsbNicSearchUsbIo (
EFI_DEVICE_PATH_PROTOCOL *ThisUsbDevicePath;
EFI_DEVICE_PATH_PROTOCOL *ThisUsbDevicePathEnd;
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __func__));
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, "Device path on the EFI handle which has UsbIo and SNP instaleld on it.\n"));
DevicePathStr = ConvertDevicePathToText (UsbDevicePath, FALSE, FALSE);
if (DevicePathStr != NULL) {
@@ -987,7 +987,7 @@ IdentifyUsbNicBmcChannel (
EFI_USB_IO_PROTOCOL *UsbIo;
HOST_INTERFACE_BMC_USB_NIC_INFO *BmcUsbNic;
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __func__));
Status = gBS->HandleProtocol (
Handle,
&gEfiSimpleNetworkProtocolGuid,
@@ -1074,7 +1074,7 @@ CheckBmcUsbNicOnHandles (
return EFI_INVALID_PARAMETER;
}
DEBUG ((DEBUG_INFO, "%a: Entry, #%d SNP handle\n", __FUNCTION__, HandleNumer));
DEBUG ((DEBUG_INFO, "%a: Entry, #%d SNP handle\n", __func__, HandleNumer));
GotOneUsbNIc = FALSE;
for (Index = 0; Index < HandleNumer; Index++) {
@@ -1084,7 +1084,7 @@ CheckBmcUsbNicOnHandles (
(VOID **)&DevicePath
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, " Failed to locate SNP on %d handle.\n", __FUNCTION__, Index));
DEBUG ((DEBUG_ERROR, " Failed to locate SNP on %d handle.\n", __func__, Index));
continue;
}
@@ -1137,7 +1137,7 @@ CheckBmcUsbNic (
UINTN BufferSize;
EFI_HANDLE *HandleBuffer;
DEBUG ((DEBUG_INFO, "%a: Entry, the registration key - 0x%08x.\n", __FUNCTION__, Registration));
DEBUG ((DEBUG_INFO, "%a: Entry, the registration key - 0x%08x.\n", __func__, Registration));
Handle = NULL;
Status = EFI_SUCCESS;
@@ -1213,7 +1213,7 @@ PlatformHostInterfaceSnpCallback (
IN VOID *Context
)
{
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry.\n", __func__));
CheckBmcUsbNic (mPlatformHostInterfaceSnpRegistration);
return;
@@ -1241,7 +1241,7 @@ RedfishPlatformHostInterfaceNotification (
{
EFI_STATUS Status;
DEBUG ((DEBUG_INFO, "%a: Entry\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__));
*InformationReadinessGuid = NULL;
InitializeListHead (&mBmcUsbNic);
@@ -1257,7 +1257,7 @@ RedfishPlatformHostInterfaceNotification (
}
if (Status == EFI_NOT_FOUND) {
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, "%a: BMC USB NIC is not found. Register the notification.\n", __FUNCTION__));
DEBUG ((DEBUG_REDFISH_HOST_INTERFACE, "%a: BMC USB NIC is not found. Register the notification.\n", __func__));
// Register the notification of SNP installation.
Status = gBS->CreateEvent (
@@ -1268,7 +1268,7 @@ RedfishPlatformHostInterfaceNotification (
&mPlatformHostInterfaceSnpEvent
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: Fail to create event for the installation of SNP protocol.", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: Fail to create event for the installation of SNP protocol.", __func__));
return Status;
}
@@ -1278,7 +1278,7 @@ RedfishPlatformHostInterfaceNotification (
&mPlatformHostInterfaceSnpRegistration
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: Fail to register event for the installation of SNP protocol.", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: Fail to register event for the installation of SNP protocol.", __func__));
return Status;
}
@@ -1286,6 +1286,6 @@ RedfishPlatformHostInterfaceNotification (
return EFI_SUCCESS;
}
DEBUG ((DEBUG_ERROR, "%a: Something wrong when look for BMC USB NIC.\n", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: Something wrong when look for BMC USB NIC.\n", __func__));
return Status;
}

28
RedfishPkg/Library/RedfishPlatformCredentialIpmiLib/RedfishPlatformCredentialIpmiLib.c
View File

@@ -63,10 +63,10 @@ LibStopRedfishService (
//
Status = SetBootstrapAccountCredentialsToVariable (NULL, NULL, TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: fail to remove bootstrap credential: %r\n", __FUNCTION__, Status));
DEBUG ((DEBUG_ERROR, "%a: fail to remove bootstrap credential: %r\n", __func__, Status));
}
DEBUG ((DEBUG_INFO, "%a: bootstrap credential service stopped\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: bootstrap credential service stopped\n", __func__));
return EFI_SUCCESS;
}
@@ -153,7 +153,7 @@ GetBootstrapAccountCredentials (
return EFI_INVALID_PARAMETER;
}
DEBUG ((DEBUG_VERBOSE, "%a: Disable bootstrap control: 0x%x\n", __FUNCTION__, DisableBootstrapControl));
DEBUG ((DEBUG_VERBOSE, "%a: Disable bootstrap control: 0x%x\n", __func__, DisableBootstrapControl));
//
// IPMI callout to NetFn 2C, command 02
@@ -183,19 +183,19 @@ GetBootstrapAccountCredentials (
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: IPMI transaction failure. Returning\n", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: IPMI transaction failure. Returning\n", __func__));
return Status;
} else {
if (ResponseData.CompletionCode != IPMI_COMP_CODE_NORMAL) {
if (ResponseData.CompletionCode == REDFISH_IPMI_COMP_CODE_BOOTSTRAP_CREDENTIAL_DISABLED) {
DEBUG ((DEBUG_ERROR, "%a: bootstrap credential support was disabled\n", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: bootstrap credential support was disabled\n", __func__));
return EFI_ACCESS_DENIED;
}
DEBUG ((DEBUG_ERROR, "%a: Completion code = 0x%x. Returning\n", __FUNCTION__, ResponseData.CompletionCode));
DEBUG ((DEBUG_ERROR, "%a: Completion code = 0x%x. Returning\n", __func__, ResponseData.CompletionCode));
return EFI_PROTOCOL_ERROR;
} else if (ResponseData.GroupExtensionId != REDFISH_IPMI_GROUP_EXTENSION) {
DEBUG ((DEBUG_ERROR, "%a: Group Extension Response = 0x%x. Returning\n", __FUNCTION__, ResponseData.GroupExtensionId));
DEBUG ((DEBUG_ERROR, "%a: Group Extension Response = 0x%x. Returning\n", __func__, ResponseData.GroupExtensionId));
return EFI_DEVICE_ERROR;
} else {
if (BootstrapUsername != NULL) {
@@ -216,7 +216,7 @@ GetBootstrapAccountCredentials (
}
}
DEBUG ((DEBUG_INFO, "%a: get bootstrap credential via IPMI: %r\n", __FUNCTION__, Status));
DEBUG ((DEBUG_INFO, "%a: get bootstrap credential via IPMI: %r\n", __func__, Status));
return Status;
}
@@ -269,7 +269,7 @@ GetBootstrapAccountCredentialsFromVariable (
}
if (DataSize != sizeof (BOOTSTRAP_CREDENTIALS_VARIABLE)) {
DEBUG ((DEBUG_ERROR, "%a: data corruption. returned size: %d != structure size: %d\n", __FUNCTION__, DataSize, sizeof (BOOTSTRAP_CREDENTIALS_VARIABLE)));
DEBUG ((DEBUG_ERROR, "%a: data corruption. returned size: %d != structure size: %d\n", __func__, DataSize, sizeof (BOOTSTRAP_CREDENTIALS_VARIABLE)));
FreePool (Data);
return EFI_NOT_FOUND;
}
@@ -284,7 +284,7 @@ GetBootstrapAccountCredentialsFromVariable (
FreePool (Data);
DEBUG ((DEBUG_INFO, "%a: get bootstrap credential from variable\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: get bootstrap credential from variable\n", __func__));
return EFI_SUCCESS;
}
@@ -412,7 +412,7 @@ LibCredentialGetAuthInfo (
DisableCredentialService = PcdGetBool (PcdRedfishDisableBootstrapCredentialService);
if (mRedfishServiceStopped) {
DEBUG ((DEBUG_ERROR, "%a: credential service is stopped due to security reason\n", __FUNCTION__));
DEBUG ((DEBUG_ERROR, "%a: credential service is stopped due to security reason\n", __func__));
return EFI_ACCESS_DENIED;
}
@@ -441,17 +441,17 @@ LibCredentialGetAuthInfo (
//
Status = GetBootstrapAccountCredentials (DisableCredentialService, *UserId, USERNAME_MAX_SIZE, *Password, PASSWORD_MAX_SIZE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: fail to get bootstrap credential: %r\n", __FUNCTION__, Status));
DEBUG ((DEBUG_ERROR, "%a: fail to get bootstrap credential: %r\n", __func__, Status));
return Status;
}
if (DisableCredentialService) {
DEBUG ((DEBUG_INFO, "%a: credential bootstrapping control disabled\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: credential bootstrapping control disabled\n", __func__));
}
Status = SetBootstrapAccountCredentialsToVariable (*UserId, *Password, FALSE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: fail to cache bootstrap credential: %r\n", __FUNCTION__, Status));
DEBUG ((DEBUG_ERROR, "%a: fail to cache bootstrap credential: %r\n", __func__, Status));
}
return EFI_SUCCESS;