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>

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index 3a051fd58003d9678e311b73f5752fea99b9d21c..edd6572578dda303eaa03c263e25638fef97dc15 100644 (file)
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -592,79 +592,6 @@ UnicodeSPrintAsciiFormat (
   return NumberOfPrinted;\r
 }\r
 \r
-#ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
-\r
-/**\r
-  [ATTENTION] This function is deprecated for security reason.\r
-\r
-  Converts a decimal value to a Null-terminated Unicode string.\r
-\r
-  Converts the decimal number specified by Value to a Null-terminated Unicode\r
-  string specified by Buffer containing at most Width characters. No padding of spaces\r
-  is ever performed. If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
-  The number of Unicode characters in Buffer is returned not including the Null-terminator.\r
-  If the conversion contains more than Width characters, then only the first\r
-  Width characters are returned, and the total number of characters\r
-  required to perform the conversion is returned.\r
-  Additional conversion parameters are specified in Flags.\r
-\r
-  The Flags bit LEFT_JUSTIFY is always ignored.\r
-  All conversions are left justified in Buffer.\r
-  If Width is 0, PREFIX_ZERO is ignored in Flags.\r
-  If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
-  are inserted every 3rd digit starting from the right.\r
-  If RADIX_HEX is set in Flags, then the output buffer will be\r
-  formatted in hexadecimal format.\r
-  If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r
-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored,\r
-  then Buffer is padded with '0' characters so the combination of the optional '-'\r
-  sign character, '0' characters, digit characters for Value, and the Null-terminator\r
-  add up to Width characters.\r
-  If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
-  If Buffer is NULL, then ASSERT().\r
-  If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
-  If unsupported bits are set in Flags, then ASSERT().\r
-  If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
-  If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()\r
-\r
-  @param  Buffer  Pointer to the output buffer for the produced Null-terminated\r
-                  Unicode string.\r
-  @param  Flags   The bitmask of flags that specify left justification, zero pad, and commas.\r
-  @param  Value   The 64-bit signed value to convert to a string.\r
-  @param  Width   The maximum number of Unicode characters to place in Buffer, not including\r
-                  the Null-terminator.\r
-\r
-  @return The number of Unicode characters in Buffer not including the Null-terminator.\r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-UnicodeValueToString (\r
-  IN OUT CHAR16  *Buffer,\r
-  IN UINTN       Flags,\r
-  IN INT64       Value,\r
-  IN UINTN       Width\r
-  )\r
-{\r
-  RETURN_STATUS  Status;\r
-  UINTN          BufferSize;\r
-\r
-  if (Width == 0) {\r
-    BufferSize = (MAXIMUM_VALUE_CHARACTERS + 1) * sizeof (CHAR16);\r
-  } else {\r
-    BufferSize = (Width + 1) * sizeof (CHAR16);\r
-  }\r
-\r
-  Status = mPrint2SProtocol->UnicodeValueToStringS (Buffer, BufferSize, Flags, Value, Width);\r
-  if (RETURN_ERROR (Status)) {\r
-    return 0;\r
-  }\r
-\r
-  return StrnLenS (Buffer, BufferSize / sizeof (CHAR16));\r
-}\r
-\r
-#endif\r
-\r
 /**\r
   Converts a decimal value to a Null-terminated Unicode string.\r
 \r
@@ -1071,78 +998,6 @@ AsciiSPrintUnicodeFormat (
 }\r
 \r
 \r
-#ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r
-\r
-/**\r
-  [ATTENTION] This function is deprecated for security reason.\r
-\r
-  Converts a decimal value to a Null-terminated ASCII string.\r
-\r
-  Converts the decimal number specified by Value to a Null-terminated ASCII string\r
-  specified by Buffer containing at most Width characters. No padding of spaces\r
-  is ever performed.\r
-  If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
-  The number of ASCII characters in Buffer is returned not including the Null-terminator.\r
-  If the conversion contains more than Width characters, then only the first Width\r
-  characters are returned, and the total number of characters required to perform\r
-  the conversion is returned.\r
-  Additional conversion parameters are specified in Flags.\r
-  The Flags bit LEFT_JUSTIFY is always ignored.\r
-  All conversions are left justified in Buffer.\r
-  If Width is 0, PREFIX_ZERO is ignored in Flags.\r
-  If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
-  are inserted every 3rd digit starting from the right.\r
-  If RADIX_HEX is set in Flags, then the output buffer will be\r
-  formatted in hexadecimal format.\r
-  If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r
-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored,\r
-  then Buffer is padded with '0' characters so the combination of the optional '-'\r
-  sign character, '0' characters, digit characters for Value, and the Null-terminator\r
-  add up to Width characters.\r
-\r
-  If Buffer is NULL, then ASSERT().\r
-  If unsupported bits are set in Flags, then ASSERT().\r
-  If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
-  If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()\r
-\r
-  @param  Buffer  Pointer to the output buffer for the produced Null-terminated\r
-                  ASCII string.\r
-  @param  Flags   The bitmask of flags that specify left justification, zero pad, and commas.\r
-  @param  Value   The 64-bit signed value to convert to a string.\r
-  @param  Width   The maximum number of ASCII characters to place in Buffer, not including\r
-                  the Null-terminator.\r
-\r
-  @return The number of ASCII characters in Buffer not including the Null-terminator.\r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-AsciiValueToString (\r
-  OUT CHAR8      *Buffer,\r
-  IN  UINTN      Flags,\r
-  IN  INT64      Value,\r
-  IN  UINTN      Width\r
-  )\r
-{\r
-  RETURN_STATUS  Status;\r
-  UINTN          BufferSize;\r
-\r
-  if (Width == 0) {\r
-    BufferSize = (MAXIMUM_VALUE_CHARACTERS + 1) * sizeof (CHAR8);\r
-  } else {\r
-    BufferSize = (Width + 1) * sizeof (CHAR8);\r
-  }\r
-\r
-  Status = mPrint2SProtocol->AsciiValueToStringS (Buffer, BufferSize, Flags, Value, Width);\r
-  if (RETURN_ERROR (Status)) {\r
-    return 0;\r
-  }\r
-\r
-  return AsciiStrnLenS (Buffer, BufferSize / sizeof (CHAR8));\r
-}\r
-\r
-#endif\r
-\r
 /**\r
   Converts a decimal value to a Null-terminated Ascii string.\r
 \r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 25aea3e2a481ac9f6e9960c6cdfba9f70af06cd6..fbbc9933f5e8d1e71f1fadd2f92f4aa3c664343d 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -491,5 +491,4 @@
   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf\r
 \r
 [BuildOptions]\r
-  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
 \r

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