diff options
| author | Rebecca Cran <rebecca@bsdio.com> | 2023-04-06 13:53:10 -0600 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-04-10 14:19:57 +0000 |
| commit | 74ce342f1828469fce3221b0b917347cad71f665 (patch) | |
| tree | 3b436438c8ca8f0fa01cbbd653c05775c2b5ff79 | |
| parent | f1d31a6ec7d5a4251d441a62b2cc6f11f0f49da4 (diff) | |
| download | edk2-74ce342f1828469fce3221b0b917347cad71f665.tar.gz edk2-74ce342f1828469fce3221b0b917347cad71f665.tar.bz2 edk2-74ce342f1828469fce3221b0b917347cad71f665.zip | |
CryptoPkg: 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
CryptoPkg.
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>
| -rw-r--r-- | CryptoPkg/Library/TlsLib/TlsConfig.c | 8 | ||||
| -rw-r--r-- | CryptoPkg/Library/TlsLib/TlsProcess.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c index 60559de4a7..fdda73690a 100644 --- a/CryptoPkg/Library/TlsLib/TlsConfig.c +++ b/CryptoPkg/Library/TlsLib/TlsConfig.c @@ -331,7 +331,7 @@ TlsSetCipherList ( DEBUG_VERBOSE,
"%a:%a: skipping CipherId=0x%04x\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
CipherId[Index]
));
//
@@ -380,7 +380,7 @@ TlsSetCipherList ( DEBUG_ERROR,
"%a:%a: no CipherId could be mapped\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
Status = EFI_UNSUPPORTED;
goto FreeMappedCipher;
@@ -441,7 +441,7 @@ TlsSetCipherList ( DEBUG_VERBOSE,
"%a:%a: CipherString={\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
for (CipherStringPosition = CipherString;
CipherStringPosition < CipherString + FullLength;
@@ -610,7 +610,7 @@ TlsSetVerifyHost ( "%a:%a: parsed \"%a\" as an IPv%c address "
"literal\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
HostName,
(UINTN)((BinaryAddressSize == NS_IN6ADDRSZ) ? '6' : '4')
));
diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c index a803d86c4f..db296053fd 100644 --- a/CryptoPkg/Library/TlsLib/TlsProcess.c +++ b/CryptoPkg/Library/TlsLib/TlsProcess.c @@ -127,7 +127,7 @@ TlsDoHandshake ( DEBUG ((
DEBUG_ERROR,
"%a SSL_HANDSHAKE_ERROR State=0x%x SSL_ERROR_%a\n",
- __FUNCTION__,
+ __func__,
SSL_get_state (TlsConn->Ssl),
Ret == SSL_ERROR_SSL ? "SSL" : Ret == SSL_ERROR_SYSCALL ? "SYSCALL" : "ZERO_RETURN"
));
@@ -141,7 +141,7 @@ TlsDoHandshake ( DEBUG ((
DEBUG_ERROR,
"%a ERROR 0x%x=L%x:F%x:R%x\n",
- __FUNCTION__,
+ __func__,
ErrorCode,
ERR_GET_LIB (ErrorCode),
ERR_GET_FUNC (ErrorCode),
|