Rename Protocol/FrameworkHii.h to Protocol/HiiFramework.h to follow the naming conven...

[mirror_edk2.git] / MdePkg / Library / BasePrintLib / PrintLibInternal.c

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 0a75a3c58114e04614d0ec31c3b136602798d6c1..fec8db898332a6f70a57390265dd89dba1d7085f 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -1,7 +1,7 @@
 /** @file\r
   Print Library worker functions.\r
 \r
-  Copyright (c) 2006, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -14,9 +14,14 @@
 \r
 **/\r
 \r
+//\r
+// Include common header file for this module.\r
+//\r
+\r
+\r
 #include "PrintLibInternal.h"\r
 \r
-static CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r
 \r
 \r
 /**\r
@@ -105,11 +110,13 @@ BasePrintLibValueToString (
   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 Value is < 0, then the fist character in Buffer is a '-'.\r
+  If HEX_RADIX is set in Flags, then the output buffer will be formatted in hexadecimal format.\r
+  If Value is < 0 and HEX_RADIX 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 HEX_RADIX are set in Flags, then ASSERT().\r
 \r
   If Buffer is NULL, then ASSERT().\r
   If unsupported bits are set in Flags, then ASSERT().\r
@@ -142,13 +149,19 @@ BasePrintLibConvertValueToString (
   UINTN  Count;\r
   UINTN  Digits;\r
   UINTN  Index;\r
+  UINTN  Radix;\r
 \r
   ASSERT (Buffer != NULL);\r
   ASSERT (Width < MAXIMUM_VALUE_CHARACTERS);\r
   //\r
   // Make sure Flags can only contain supported bits.\r
   //\r
-  ASSERT ((Flags & ~(LEFT_JUSTIFY | COMMA_TYPE | PREFIX_ZERO)) == 0);\r
+  ASSERT ((Flags & ~(LEFT_JUSTIFY | COMMA_TYPE | PREFIX_ZERO | RADIX_HEX)) == 0);\r
+\r
+  //\r
+  // If both COMMA_TYPE and HEX_RADIX are set, then ASSERT ()\r
+  //\r
+  ASSERT (((Flags & COMMA_TYPE) != 0 && (Flags & RADIX_HEX) != 0) == FALSE);\r
 \r
   OriginalBuffer = Buffer;\r
 \r
@@ -164,13 +177,14 @@ BasePrintLibConvertValueToString (
   //\r
   EndBuffer = Buffer + Width * Increment;\r
 \r
-  if (Value < 0) {\r
+  if ((Value < 0) && ((Flags & RADIX_HEX) == 0)) {\r
     Value = -Value;\r
     Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, '-', Increment);\r
     Width--;\r
   }\r
 \r
-  Count = BasePrintLibValueToString (ValueBuffer, Value, 10);\r
+  Radix = ((Flags & RADIX_HEX) == 0)? 10 : 16;\r
+  Count = BasePrintLibValueToString (ValueBuffer, Value, Radix);\r
 \r
   if ((Flags & PREFIX_ZERO) != 0) {\r
     Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Count, '0', Increment);\r
@@ -193,7 +207,8 @@ BasePrintLibConvertValueToString (
     }\r
   }\r
 \r
-  BasePrintLibFillBuffer (Buffer, EndBuffer, 1, 0, Increment);\r
+  BasePrintLibFillBuffer (Buffer, EndBuffer + Increment, 1, 0, Increment);\r
 \r
   return ((Buffer - OriginalBuffer) / Increment);\r
 }\r
+\r