From 84f553cb63c6a2b37fe95cca5ea9ddc078ca2be9 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Thu, 6 Apr 2023 13:53:26 -0600 Subject: NetworkPkg: 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 NetworkPkg. Signed-off-by: Rebecca Cran Reviewed-by: Michael D Kinney Reviewed-by: Ard Biesheuvel --- NetworkPkg/HttpDxe/HttpsSupport.c | 16 ++++++++-------- NetworkPkg/IScsiDxe/IScsiMisc.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'NetworkPkg') diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c index ad611e7c38..7330be42c0 100644 --- a/NetworkPkg/HttpDxe/HttpsSupport.c +++ b/NetworkPkg/HttpDxe/HttpsSupport.c @@ -436,7 +436,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: truncated EFI_SIGNATURE_LIST header\n", - __FUNCTION__ + __func__ )); goto FreeCACert; } @@ -447,7 +447,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: SignatureListSize too small for EFI_SIGNATURE_LIST\n", - __FUNCTION__ + __func__ )); goto FreeCACert; } @@ -456,7 +456,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: truncated EFI_SIGNATURE_LIST body\n", - __FUNCTION__ + __func__ )); goto FreeCACert; } @@ -465,7 +465,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: only X509 certificates are supported\n", - __FUNCTION__ + __func__ )); Status = EFI_UNSUPPORTED; goto FreeCACert; @@ -475,7 +475,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: SignatureHeaderSize must be 0 for X509\n", - __FUNCTION__ + __func__ )); goto FreeCACert; } @@ -484,7 +484,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: SignatureSize too small for EFI_SIGNATURE_DATA\n", - __FUNCTION__ + __func__ )); goto FreeCACert; } @@ -495,7 +495,7 @@ TlsConfigCertificate ( DEBUG (( DEBUG_ERROR, "%a: EFI_SIGNATURE_DATA array not a multiple of SignatureSize\n", - __FUNCTION__ + __func__ )); goto FreeCACert; } @@ -505,7 +505,7 @@ TlsConfigCertificate ( } if (CertCount == 0) { - DEBUG ((DEBUG_ERROR, "%a: no X509 certificates provided\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: no X509 certificates provided\n", __func__)); goto FreeCACert; } diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c index b3ea90158f..78dc5c73d3 100644 --- a/NetworkPkg/IScsiDxe/IScsiMisc.c +++ b/NetworkPkg/IScsiDxe/IScsiMisc.c @@ -875,7 +875,7 @@ IScsiCreateAttempts ( DEBUG_ERROR, "%a: Failed to set 'InitialAttemptOrder' with Guid (%g): " "%r\n", - __FUNCTION__, + __func__, &gIScsiConfigGuid, Status )); @@ -926,7 +926,7 @@ IScsiCreateAttempts ( DEBUG_ERROR, "%a: Failed to set variable (mPrivate->PortString) with Guid (%g): " "%r\n", - __FUNCTION__, + __func__, &gEfiIScsiInitiatorNameProtocolGuid, Status )); -- cgit v1.2.3