__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.
Visual Studio versions before VS 2015 don't support __func__ and so
will fail to compile. A workaround is to define __func__ as
__FUNCTION__ :
#define __func__ __FUNCTION__
Signed-off-by: Rebecca Cran <rebe...@bsdio.com>
---
NetworkPkg/HttpDxe/HttpsSupport.c | 16 ++++++++--------
NetworkPkg/IScsiDxe/IScsiMisc.c | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c
b/NetworkPkg/HttpDxe/HttpsSupport.c
index ad611e7c3836..7330be42c006 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 b3ea90158f51..78dc5c73d35a 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
));
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102644): https://edk2.groups.io/g/devel/message/102644
Mute This Topic: https://groups.io/mt/98115252/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
