MdeModulePkg: Remove code wrapped by DISABLE_NEW_DEPRECATED_INTERFACES

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2777
Code wrapped by DISABLE_NEW_DEPRECATED_INTERFACES is deprecated.
So remove it.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Zhang, Shenglei
2020-08-05 14:08:04 +08:00
committed by mergify[bot]
parent 9c1f455f5f
commit 5d1af380d3
3 changed files with 6 additions and 177 deletions

View File

@@ -17,7 +17,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
/**
Implementaion of the UnicodeValueToString service in EFI_PRINT2_PROTOCOL.
If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then ASSERT().
@param Buffer The pointer to the output buffer for the produced
Null-terminated Unicode string.
@@ -27,9 +26,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@param Width The maximum number of Unicode characters to place in Buffer,
not including the Null-terminator.
@return If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, return 0.
Otherwise, return the number of Unicode characters in Buffer not
including the Null-terminator.
@return 0.
**/
UINTN
@@ -41,28 +39,16 @@ PrintDxeUnicodeValueToString (
IN UINTN Width
)
{
#ifdef DISABLE_NEW_DEPRECATED_INTERFACES
//
// If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then the
// PrintLib API UnicodeValueToString is already deprecated.
// In this case, ASSERT will be triggered and zero will be returned for the
// implementation of the UnicodeValueToString service in EFI_PRINT2_PROTOCOL
// to indicate that the service is no longer supported.
//
DEBUG ((DEBUG_ERROR, "PrintDxe: The UnicodeValueToString service in EFI_PRINT2_PROTOCOL is no longer supported for security reason.\n"));
DEBUG ((DEBUG_ERROR, "PrintDxe: Please consider using the UnicodeValueToStringS service in EFI_PRINT2S_PROTOCOL.\n"));
ASSERT (FALSE);
return 0;
#else
return UnicodeValueToString (Buffer, Flags, Value, Width);
#endif
}
/**
Implementaion of the AsciiValueToString service in EFI_PRINT2_PROTOCOL.
If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then ASSERT().
@param Buffer A pointer to the output buffer for the produced
Null-terminated ASCII string.
@param Flags The bitmask of flags that specify left justification, zero
@@ -71,9 +57,7 @@ PrintDxeUnicodeValueToString (
@param Width The maximum number of ASCII characters to place in Buffer,
not including the Null-terminator.
@return If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, return 0.
Otherwise, return the number of ASCII characters in Buffer not
including the Null-terminator.
@return 0.
**/
UINTN
@@ -85,21 +69,12 @@ PrintDxeAsciiValueToString (
IN UINTN Width
)
{
#ifdef DISABLE_NEW_DEPRECATED_INTERFACES
//
// If the macro DISABLE_NEW_DEPRECATED_INTERFACES is defined, then the
// PrintLib API AsciiValueToString is already deprecated.
// In this case, ASSERT will be triggered and zero will be returned for the
// implementation of the AsciiValueToString service in EFI_PRINT2_PROTOCOL
// to indicate that the service is no longer supported.
//
DEBUG ((DEBUG_ERROR, "PrintDxe: The AsciiValueToString service in EFI_PRINT2_PROTOCOL is no longer supported for security reason.\n"));
DEBUG ((DEBUG_ERROR, "PrintDxe: Please consider using the AsciiValueToStringS service in EFI_PRINT2S_PROTOCOL.\n"));
ASSERT (FALSE);
return 0;
#else
return AsciiValueToString (Buffer, Flags, Value, Width);
#endif
}
EFI_HANDLE mPrintThunkHandle = NULL;