From 997419d16fcd400d7cfb0dbbc3c37ef1239fb962 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Thu, 6 Apr 2023 13:51:09 -0600 Subject: RedfishPkg: 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 RedfishPkg. Signed-off-by: Rebecca Cran Reviewed-by: Michael D Kinney Ard Biesheuvel Reviewed-by: Nickle Wang --- .../PlatformHostInterfaceBmcUsbNicLib.c | 36 ++++++------- .../RedfishPlatformCredentialIpmiLib.c | 28 +++++----- RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.c | 2 +- .../RedfishLib/edk2libredfish/src/service.c | 4 +- .../RedfishConfigHandlerCommon.c | 6 +-- .../RedfishConfigHandlerDriver.c | 20 +++---- RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c | 62 +++++++++++----------- .../RedfishHostInterfaceDxe.c | 14 ++--- RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c | 14 ++--- 9 files changed, 93 insertions(+), 93 deletions(-) (limited to 'RedfishPkg') diff --git a/RedfishPkg/Library/PlatformHostInterfaceBmcUsbNicLib/PlatformHostInterfaceBmcUsbNicLib.c b/RedfishPkg/Library/PlatformHostInterfaceBmcUsbNicLib/PlatformHostInterfaceBmcUsbNicLib.c index 122473dbe4..4bd01850af 100644 --- a/RedfishPkg/Library/PlatformHostInterfaceBmcUsbNicLib/PlatformHostInterfaceBmcUsbNicLib.c +++ b/RedfishPkg/Library/PlatformHostInterfaceBmcUsbNicLib/PlatformHostInterfaceBmcUsbNicLib.c @@ -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; } diff --git a/RedfishPkg/Library/RedfishPlatformCredentialIpmiLib/RedfishPlatformCredentialIpmiLib.c b/RedfishPkg/Library/RedfishPlatformCredentialIpmiLib/RedfishPlatformCredentialIpmiLib.c index dacb09bb23..3b34dafbaf 100644 --- a/RedfishPkg/Library/RedfishPlatformCredentialIpmiLib/RedfishPlatformCredentialIpmiLib.c +++ b/RedfishPkg/Library/RedfishPlatformCredentialIpmiLib/RedfishPlatformCredentialIpmiLib.c @@ -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; diff --git a/RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.c b/RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.c index 51a85a7336..0a0a4e6458 100644 --- a/RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.c +++ b/RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.c @@ -1101,7 +1101,7 @@ RedfishIsValidOdataType ( } } - DEBUG ((DEBUG_INFO, "%a: This Odata type is not in the list.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: This Odata type is not in the list.\n", __func__)); return FALSE; } diff --git a/RedfishPkg/PrivateLibrary/RedfishLib/edk2libredfish/src/service.c b/RedfishPkg/PrivateLibrary/RedfishLib/edk2libredfish/src/service.c index cbd4330a0e..206094d87d 100644 --- a/RedfishPkg/PrivateLibrary/RedfishLib/edk2libredfish/src/service.c +++ b/RedfishPkg/PrivateLibrary/RedfishLib/edk2libredfish/src/service.c @@ -521,7 +521,7 @@ getUriFromService ( // Status = DecodeResponseContent (ContentEncodedHeader->FieldValue, &ResponseMsg.Body, &ResponseMsg.BodyLength); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Failed to decompress the response content %r\n.", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: Failed to decompress the response content %r\n.", __func__, Status)); ret = NULL; goto ON_EXIT; } @@ -656,7 +656,7 @@ patchUriFromService ( // Status = EncodeRequestContent ((CHAR8 *)HTTP_CONTENT_ENCODING_GZIP, (CHAR8 *)content, (VOID **)&EncodedContent, &EncodedContentLen); if (Status == EFI_INVALID_PARAMETER) { - DEBUG ((DEBUG_ERROR, "%a: Error to encode content.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Error to encode content.\n", __func__)); ret = NULL; goto ON_EXIT; } else if (Status == EFI_UNSUPPORTED) { diff --git a/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerCommon.c b/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerCommon.c index 96aac125ee..b51b558a48 100644 --- a/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerCommon.c +++ b/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerCommon.c @@ -122,7 +122,7 @@ RedfishConfigCommonInit ( // Status = gBS->LocateProtocol (&gEdkIIRedfishCredentialProtocolGuid, NULL, (VOID **)&gCredential); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_INFO, "%a: No Redfish Credential Protocol is installed on system.", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: No Redfish Credential Protocol is installed on system.", __func__)); return Status; } @@ -138,7 +138,7 @@ RedfishConfigCommonInit ( &gEndOfDxeEvent ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Fail to register End Of DXE event.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to register End Of DXE event.", __func__)); return Status; } @@ -156,7 +156,7 @@ RedfishConfigCommonInit ( if (EFI_ERROR (Status)) { gBS->CloseEvent (gEndOfDxeEvent); gEndOfDxeEvent = NULL; - DEBUG ((DEBUG_ERROR, "%a: Fail to register Exit Boot Service event.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to register Exit Boot Service event.", __func__)); return Status; } diff --git a/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerDriver.c b/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerDriver.c index 96ac70f418..993ad338b6 100644 --- a/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerDriver.c +++ b/RedfishPkg/RedfishConfigHandler/RedfishConfigHandlerDriver.c @@ -372,7 +372,7 @@ RedfishDiscoverProtocolInstalled ( EFI_REDFISH_DISCOVER_NETWORK_INTERFACE *ThisNetworkInterface; EFI_REDFISH_DISCOVERED_TOKEN *ThisRedfishDiscoveredToken; - DEBUG ((DEBUG_INFO, "%a: New network interface is installed on system by EFI Redfish discover driver.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: New network interface is installed on system by EFI Redfish discover driver.\n", __func__)); BufferSize = sizeof (EFI_HANDLE); Status = gBS->LocateHandle ( @@ -383,7 +383,7 @@ RedfishDiscoverProtocolInstalled ( &HandleBuffer ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Can't locate handle with EFI_REDFISH_DISCOVER_PROTOCOL installed.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Can't locate handle with EFI_REDFISH_DISCOVER_PROTOCOL installed.\n", __func__)); } gRedfishDiscoverActivated = TRUE; @@ -403,7 +403,7 @@ RedfishDiscoverProtocolInstalled ( if (EFI_ERROR (Status)) { gEfiRedfishDiscoverProtocol = NULL; gRedfishDiscoverActivated = FALSE; - DEBUG ((DEBUG_ERROR, "%a: Can't locate EFI_REDFISH_DISCOVER_PROTOCOL.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Can't locate EFI_REDFISH_DISCOVER_PROTOCOL.\n", __func__)); return; } } @@ -422,13 +422,13 @@ RedfishDiscoverProtocolInstalled ( &gNetworkInterfaceInstances ); if (EFI_ERROR (Status) || (gNumberOfNetworkInterfaces == 0)) { - DEBUG ((DEBUG_ERROR, "%a: No network interfaces found on the handle.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: No network interfaces found on the handle.\n", __func__)); return; } gRedfishDiscoveredToken = AllocateZeroPool (gNumberOfNetworkInterfaces * sizeof (EFI_REDFISH_DISCOVERED_TOKEN)); if (gRedfishDiscoveredToken == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Not enough memory for EFI_REDFISH_DISCOVERED_TOKEN.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Not enough memory for EFI_REDFISH_DISCOVERED_TOKEN.\n", __func__)); return; } @@ -449,7 +449,7 @@ RedfishDiscoverProtocolInstalled ( &ThisRedfishDiscoveredToken->Event ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Failed to create event for Redfish discovered token.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Failed to create event for Redfish discovered token.\n", __func__)); goto ErrorReturn; } @@ -472,7 +472,7 @@ RedfishDiscoverProtocolInstalled ( } if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Acquire Redfish service fail.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Acquire Redfish service fail.\n", __func__)); goto ErrorReturn; } @@ -556,7 +556,7 @@ RedfishConfigHandlerDriverEntryPoint ( &gEfiRedfishDiscoverProtocolEvent ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Fail to create event for the installation of EFI_REDFISH_DISCOVER_PROTOCOL.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to create event for the installation of EFI_REDFISH_DISCOVER_PROTOCOL.", __func__)); return Status; } @@ -566,7 +566,7 @@ RedfishConfigHandlerDriverEntryPoint ( &gEfiRedfishDiscoverRegistration ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Fail to register event for the installation of EFI_REDFISH_DISCOVER_PROTOCOL.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to register event for the installation of EFI_REDFISH_DISCOVER_PROTOCOL.", __func__)); return Status; } @@ -593,7 +593,7 @@ RedfishConfigHandlerDriverEntryPoint ( gExitBootServiceEvent = NULL; gBS->CloseEvent (gEfiRedfishDiscoverProtocolEvent); gEfiRedfishDiscoverProtocolEvent = NULL; - DEBUG ((DEBUG_ERROR, "%a: Fail to install EFI Binding Protocol of EFI Redfish Config driver.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to install EFI Binding Protocol of EFI Redfish Config driver.", __func__)); return Status; } diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c index f64c79088f..583c6f78e1 100644 --- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c +++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c @@ -196,13 +196,13 @@ Tcp4GetSubnetInfo ( Tcp4Option.EnableNagle = TRUE; Status = Tcp4->Configure (Tcp4, &Tcp4CfgData); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Can't get subnet information\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Can't get subnet information\n", __func__)); return Status; } Status = Tcp4->GetModeData (Tcp4, NULL, NULL, &IpModedata, NULL, NULL); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Can't get IP mode data information\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Can't get IP mode data information\n", __func__)); return Status; } @@ -265,12 +265,12 @@ Tcp6GetSubnetInfo ( ZeroMem ((VOID *)&IpModedata, sizeof (EFI_IP6_MODE_DATA)); Status = Tcp6->GetModeData (Tcp6, NULL, NULL, &IpModedata, NULL, NULL); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Can't get IP mode data information\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Can't get IP mode data information\n", __func__)); return Status; } if (IpModedata.AddressCount == 0) { - DEBUG ((DEBUG_INFO, "%a: No IPv6 address configured.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: No IPv6 address configured.\n", __func__)); Instance->SubnetAddrInfoIPv6Number = 0; return EFI_SUCCESS; } @@ -282,7 +282,7 @@ Tcp6GetSubnetInfo ( Instance->SubnetAddrInfoIPv6 = AllocateZeroPool (IpModedata.AddressCount * sizeof (EFI_IP6_ADDRESS_INFO)); if (Instance->SubnetAddrInfoIPv6 == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Failed to allocate memory for IPv6 subnet address information\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Failed to allocate memory for IPv6 subnet address information\n", __func__)); return EFI_OUT_OF_RESOURCES; } @@ -529,7 +529,7 @@ DiscoverRedfishHostInterface ( IP4_COPY_ADDRESS ((VOID *)&Instance->HostSubnetMask.v4, (VOID *)Data->HostIpMask); if (EFI_IP4_EQUAL (&Instance->HostIpAddress.v4, &mZeroIp4Addr)) { - DEBUG ((DEBUG_ERROR, "%a: invalid host IP address: zero address\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: invalid host IP address: zero address\n", __func__)); // // Invalid IP address detected. Change address format to Unknown and use system default address. // @@ -537,7 +537,7 @@ DiscoverRedfishHostInterface ( } if (!IP4_IS_VALID_NETMASK (EFI_IP4 (Instance->HostSubnetMask.v4))) { - DEBUG ((DEBUG_ERROR, "%a: invalid subnet mask address\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: invalid subnet mask address\n", __func__)); // // Invalid subnet mast address detected. Change address format to Unknown and use system default address. // @@ -551,14 +551,14 @@ DiscoverRedfishHostInterface ( IP4_COPY_ADDRESS ((VOID *)&Instance->TargetIpAddress.v4, (VOID *)Data->RedfishServiceIpAddress); if (EFI_IP4_EQUAL (&Instance->TargetIpAddress.v4, &mZeroIp4Addr)) { - DEBUG ((DEBUG_ERROR, "%a: invalid service IP address: zero address\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: invalid service IP address: zero address\n", __func__)); } } else { IP6_COPY_ADDRESS ((VOID *)&Instance->TargetIpAddress.v6, (VOID *)Data->RedfishServiceIpAddress); } if (Instance->HostIntfValidation) { - DEBUG ((DEBUG_ERROR, "%a:Send UPnP unicast SSDP to validate this Redfish Host Interface is not supported.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:Send UPnP unicast SSDP to validate this Redfish Host Interface is not supported.\n", __func__)); Status = EFI_UNSUPPORTED; } else { // @@ -682,7 +682,7 @@ AddAndSignalNewRedfishService ( RestExOpened = FALSE; DeleteRestEx = FALSE; - DEBUG ((DEBUG_INFO, "%a:Add this instance to Redfish instance list.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a:Add this instance to Redfish instance list.\n", __func__)); if (Uuid != NULL) { Char16Uuid = (CHAR16 *)AllocateZeroPool (AsciiStrSize ((const CHAR8 *)Uuid) * sizeof (CHAR16)); @@ -846,7 +846,7 @@ AddAndSignalNewRedfishService ( if (!InfoRefresh) { Status = CreateRestExInstance (Instance, Instance->DiscoverToken); // Create REST EX child. if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a:Can't create REST EX child instance.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:Can't create REST EX child instance.\n", __func__)); goto ON_EXIT; } @@ -906,7 +906,7 @@ AddAndSignalNewRedfishService ( (EFI_REST_EX_CONFIG_DATA)(UINT8 *)RestExHttpConfigData ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a:REST EX configured..\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:REST EX configured..\n", __func__)); DeleteRestEx = TRUE; goto EXIT_FREE_ALL; } @@ -927,7 +927,7 @@ AddAndSignalNewRedfishService ( Status = gBS->SignalEvent (Instance->DiscoverToken->Event); if (!EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a:No event to signal!\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:No event to signal!\n", __func__)); } } @@ -997,13 +997,13 @@ NetworkInterfaceGetSubnetInfo ( Instance ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a:Failed to get Subnet infomation.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:Failed to get Subnet infomation.\n", __func__)); return Status; } else { - DEBUG ((DEBUG_INFO, "%a:MAC address: %s\n", __FUNCTION__, Instance->StrMacAddr)); + DEBUG ((DEBUG_INFO, "%a:MAC address: %s\n", __func__, Instance->StrMacAddr)); if (CheckIsIpVersion6 (Instance)) { if (Instance->SubnetAddrInfoIPv6Number == 0) { - DEBUG ((DEBUG_ERROR, "%a: There is no Subnet infomation for IPv6 network interface.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: There is no Subnet infomation for IPv6 network interface.\n", __func__)); return EFI_NOT_FOUND; } @@ -1184,13 +1184,13 @@ RedfishServiceAcquireService ( UINTN NetworkInterfacesIndex; EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *TargetNetworkInterfaceInternal; - DEBUG ((DEBUG_INFO, "%a:Entry.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a:Entry.\n", __func__)); // // Validate parameters. // if ((ImageHandle == NULL) || (Token == NULL) || ((Flags & ~EFI_REDFISH_DISCOVER_VALIDATION) == 0)) { - DEBUG ((DEBUG_ERROR, "%a:Invalid parameters.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:Invalid parameters.\n", __func__)); return EFI_INVALID_PARAMETER; } @@ -1208,7 +1208,7 @@ RedfishServiceAcquireService ( TargetNetworkInterfaceInternal = (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *)GetFirstNode (&mEfiRedfishDiscoverNetworkInterface); NumNetworkInterfaces = NumberOfNetworkInterface (); if (NumNetworkInterfaces == 0) { - DEBUG ((DEBUG_ERROR, "%a:No network interface on platform.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:No network interface on platform.\n", __func__)); return EFI_UNSUPPORTED; } } @@ -1219,10 +1219,10 @@ RedfishServiceAcquireService ( NewInstance = FALSE; Instance = GetInstanceByOwner (ImageHandle, TargetNetworkInterfaceInternal, Flags & ~EFI_REDFISH_DISCOVER_VALIDATION); // Check if we can re-use previous instance. if (Instance == NULL) { - DEBUG ((DEBUG_INFO, "%a:Create new EFI_REDFISH_DISCOVERED_INTERNAL_INSTANCE.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a:Create new EFI_REDFISH_DISCOVERED_INTERNAL_INSTANCE.\n", __func__)); Instance = (EFI_REDFISH_DISCOVERED_INTERNAL_INSTANCE *)AllocateZeroPool (sizeof (EFI_REDFISH_DISCOVERED_INTERNAL_INSTANCE)); if (Instance == NULL) { - DEBUG ((DEBUG_ERROR, "%a:Memory allocation fail.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:Memory allocation fail.\n", __func__)); } InitializeListHead (&Instance->Entry); @@ -1238,14 +1238,14 @@ RedfishServiceAcquireService ( } if (TargetNetworkInterfaceInternal->StrMacAddr != NULL) { - DEBUG ((DEBUG_INFO, "%a:Acquire Redfish service on network interface MAC address:%s.\n", __FUNCTION__, TargetNetworkInterfaceInternal->StrMacAddr)); + DEBUG ((DEBUG_INFO, "%a:Acquire Redfish service on network interface MAC address:%s.\n", __func__, TargetNetworkInterfaceInternal->StrMacAddr)); } else { - DEBUG ((DEBUG_INFO, "%a:WARNING: No MAC address on this network interface.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a:WARNING: No MAC address on this network interface.\n", __func__)); } Instance->DiscoverToken = Token; // Always use the latest Token passed by caller. if ((Flags & EFI_REDFISH_DISCOVER_HOST_INTERFACE) != 0) { - DEBUG ((DEBUG_INFO, "%a:Redfish HOST interface discovery.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a:Redfish HOST interface discovery.\n", __func__)); Instance->HostIntfValidation = FALSE; if ((Flags & EFI_REDFISH_DISCOVER_VALIDATION) != 0) { Instance->HostIntfValidation = TRUE; @@ -1255,12 +1255,12 @@ RedfishServiceAcquireService ( } if ((Flags & EFI_REDFISH_DISCOVER_SSDP) != 0) { - DEBUG ((DEBUG_ERROR, "%a:Redfish service discovery through SSDP is not supported\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:Redfish service discovery through SSDP is not supported\n", __func__)); return EFI_UNSUPPORTED; } else { if (EFI_ERROR (Status1) && EFI_ERROR (Status2)) { FreePool ((VOID *)Instance); - DEBUG ((DEBUG_ERROR, "%a:Something wrong on Redfish service discovery Status1=%x, Status2=%x.\n", __FUNCTION__, Status1, Status2)); + DEBUG ((DEBUG_ERROR, "%a:Something wrong on Redfish service discovery Status1=%x, Status2=%x.\n", __func__, Status1, Status2)); } else { if (NewInstance) { InsertTailList (&mRedfishDiscoverList, &Instance->Entry); @@ -1326,7 +1326,7 @@ RedfishServiceReleaseService ( EFI_REDFISH_DISCOVERED_INTERNAL_LIST *DiscoveredRedfishInstance; if (IsListEmpty (&mRedfishInstanceList)) { - DEBUG ((DEBUG_ERROR, "%a:No any discovered Redfish service.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a:No any discovered Redfish service.\n", __func__)); return EFI_NOT_FOUND; } @@ -1535,7 +1535,7 @@ TestForRequiredProtocols ( ); if (EFI_ERROR (Status)) { if (Index == ListCount - 1) { - DEBUG ((DEBUG_ERROR, "%a: all required protocols are found on this controller handle: %p.\n", __FUNCTION__, ControllerHandle)); + DEBUG ((DEBUG_ERROR, "%a: all required protocols are found on this controller handle: %p.\n", __func__, ControllerHandle)); return EFI_SUCCESS; } } @@ -1706,7 +1706,7 @@ BuildupNetworkInterface ( if (!NewNetworkInterfaceInstalled) { NetworkInterface = GetTargetNetworkInterfaceInternalByController (ControllerHandle); if (NetworkInterface == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Can't find network interface by ControllerHandle\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Can't find network interface by ControllerHandle\n", __func__)); return Status; } } @@ -1720,10 +1720,10 @@ BuildupNetworkInterface ( (VOID *)&mRedfishDiscover ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Fail to install EFI_REDFISH_DISCOVER_PROTOCOL\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to install EFI_REDFISH_DISCOVER_PROTOCOL\n", __func__)); } } else { - DEBUG ((DEBUG_INFO, "%a: Not REST EX, continue with next\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: Not REST EX, continue with next\n", __func__)); Index++; if (Index == (sizeof (gRequiredProtocol) / sizeof (REDFISH_DISCOVER_REQUIRED_PROTOCOL))) { break; diff --git a/RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c b/RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c index 872cf3ae06..45fc6e2182 100644 --- a/RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c +++ b/RedfishPkg/RedfishHostInterfaceDxe/RedfishHostInterfaceDxe.c @@ -59,11 +59,11 @@ RedfishCreateSmbiosTable42 ( Status = RedfishPlatformHostInterfaceDeviceDescriptor (&DeviceType, &DeviceDescriptor); if (EFI_ERROR (Status)) { if (Status == EFI_NOT_FOUND) { - DEBUG ((DEBUG_ERROR, "%a: No Redfish host interface descriptor is provided on this platform.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: No Redfish host interface descriptor is provided on this platform.", __func__)); return EFI_NOT_FOUND; } - DEBUG ((DEBUG_ERROR, "%a: Fail to get device descriptor, %r.", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: Fail to get device descriptor, %r.", __func__, Status)); return Status; } @@ -71,7 +71,7 @@ RedfishCreateSmbiosTable42 ( (DeviceType != REDFISH_HOST_INTERFACE_DEVICE_TYPE_PCI_PCIE_V2) ) { - DEBUG ((DEBUG_ERROR, "%a: Only support either protocol type 04h or 05h as Redfish host interface.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Only support either protocol type 04h or 05h as Redfish host interface.", __func__)); return EFI_UNSUPPORTED; } @@ -98,7 +98,7 @@ RedfishCreateSmbiosTable42 ( } if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Fail to get Redfish host interafce protocol type data.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to get Redfish host interafce protocol type data.", __func__)); if (ProtocolRecords != NULL) { FreePool (ProtocolRecords); } @@ -124,7 +124,7 @@ RedfishCreateSmbiosTable42 ( } else { NewProtocolRecords = ReallocatePool (CurrentProtocolsDataLength, NewProtocolsDataLength, (VOID *)ProtocolRecords); if (NewProtocolRecords == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Fail to allocate memory for Redfish host interface protocol data.", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Fail to allocate memory for Redfish host interface protocol data.", __func__)); FreePool (ProtocolRecords); FreePool (ProtocolRecord); return EFI_OUT_OF_RESOURCES; @@ -258,7 +258,7 @@ PlatformHostInterfaceInformationReady ( IN VOID *Context ) { - DEBUG ((DEBUG_INFO, "%a: Platform Redfish Host Interface informtion is ready\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: Platform Redfish Host Interface informtion is ready\n", __func__)); RedfishCreateSmbiosTable42 (); @@ -290,7 +290,7 @@ RedfishHostInterfaceDxeEntryPoint ( EFI_STATUS Status; EFI_GUID *ReadyGuid; - DEBUG ((DEBUG_INFO, "%a: Entry\n.", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: Entry\n.", __func__)); // // Check if the Redfish Host Interface depends on diff --git a/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c b/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c index 75b3f1fab8..41f2b29c83 100644 --- a/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c +++ b/RedfishPkg/RedfishRestExDxe/RedfishRestExImpl.c @@ -28,17 +28,17 @@ ResetHttpTslSession ( { EFI_STATUS Status; - DEBUG ((DEBUG_INFO, "%a: TCP connection is finished. Could be TSL session closure, reset HTTP instance for the new TLS session.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: TCP connection is finished. Could be TSL session closure, reset HTTP instance for the new TLS session.\n", __func__)); Status = Instance->HttpIo.Http->Configure (Instance->HttpIo.Http, NULL); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Error to reset HTTP instance.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Error to reset HTTP instance.\n", __func__)); return Status; } Status = Instance->HttpIo.Http->Configure (Instance->HttpIo.Http, &((EFI_REST_EX_HTTP_CONFIG_DATA *)Instance->ConfigData)->HttpConfigData); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Error to re-initiate HTTP instance.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Error to re-initiate HTTP instance.\n", __func__)); } return Status; @@ -70,7 +70,7 @@ RedfishCheckHttpReceiveStatus ( ReturnStatus = EFI_SUCCESS; } else if (HttpIoReceiveStatus != EFI_CONNECTION_FIN) { if ((Instance->Flags & RESTEX_INSTANCE_FLAGS_TCP_ERROR_RETRY) == 0) { - DEBUG ((DEBUG_ERROR, "%a: TCP error, reset HTTP session.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: TCP error, reset HTTP session.\n", __func__)); Instance->Flags |= RESTEX_INSTANCE_FLAGS_TCP_ERROR_RETRY; gBS->Stall (500); Status = ResetHttpTslSession (Instance); @@ -78,20 +78,20 @@ RedfishCheckHttpReceiveStatus ( return EFI_NOT_READY; } - DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __func__)); } ReturnStatus = EFI_DEVICE_ERROR; } else { if ((Instance->Flags & RESTEX_INSTANCE_FLAGS_TLS_RETRY) != 0) { - DEBUG ((DEBUG_ERROR, "%a: REST_EX Send and receive fail even with a new TLS session.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: REST_EX Send and receive fail even with a new TLS session.\n", __func__)); ReturnStatus = EFI_DEVICE_ERROR; } Instance->Flags |= RESTEX_INSTANCE_FLAGS_TLS_RETRY; Status = ResetHttpTslSession (Instance); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Reset HTTP instance fail.\n", __func__)); ReturnStatus = EFI_DEVICE_ERROR; } -- cgit v1.2.3