MdeModulePkg: Remove code wrapped by DISABLE_NEW_DEPRECATED_INTERFACES

[mirror_edk2.git] / MdeModulePkg / Universal / PrintDxe / Print.c

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