1. Add new API MigratePeiServicesTablePointer() in PeiServicesTablePointerLib class.

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

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 30451b922efd44694d81d5ef0705115228335865..c4fd755eec029a4bd02f717c0bddc44a1992041e 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -1,7 +1,7 @@
 /** @file\r
   Print Library internal worker functions.\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
   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,8 +14,8 @@
 \r
 #include "PrintLibInternal.h"\r
 \r
-#define WARNING_STATUS_NUMBER         4\r
-#define ERROR_STATUS_NUMBER           24\r
+#define WARNING_STATUS_NUMBER         5\r
+#define ERROR_STATUS_NUMBER           33\r
 \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
@@ -25,6 +25,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mStatusString[] = {
   "Warning Delete Failure",       //  RETURN_WARN_DELETE_FAILURE    = 2\r
   "Warning Write Failure",        //  RETURN_WARN_WRITE_FAILURE     = 3\r
   "Warning Buffer Too Small",     //  RETURN_WARN_BUFFER_TOO_SMALL  = 4\r
+  "Warning Stale Data",           //  RETURN_WARN_STALE_DATA        = 5\r
   "Load Error",                   //  RETURN_LOAD_ERROR             = 1  | MAX_BIT\r
   "Invalid Parameter",            //  RETURN_INVALID_PARAMETER      = 2  | MAX_BIT\r
   "Unsupported",                  //  RETURN_UNSUPPORTED            = 3  | MAX_BIT\r
@@ -48,7 +49,16 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mStatusString[] = {
   "Aborted",                      //  RETURN_ABORTED                = 21 | MAX_BIT\r
   "ICMP Error",                   //  RETURN_ICMP_ERROR             = 22 | MAX_BIT\r
   "TFTP Error",                   //  RETURN_TFTP_ERROR             = 23 | MAX_BIT\r
-  "Protocol Error"                //  RETURN_PROTOCOL_ERROR         = 24 | MAX_BIT\r
+  "Protocol Error",               //  RETURN_PROTOCOL_ERROR         = 24 | MAX_BIT\r
+  "Incompatible Version",         //  RETURN_INCOMPATIBLE_VERSION   = 25 | MAX_BIT\r
+  "Security Violation",           //  RETURN_SECURITY_VIOLATION     = 26 | MAX_BIT\r
+  "CRC Error",                    //  RETURN_CRC_ERROR              = 27 | MAX_BIT\r
+  "End of Media",                 //  RETURN_END_OF_MEDIA           = 28 | MAX_BIT\r
+  "Reserved (29)",                //  RESERVED                      = 29 | MAX_BIT\r
+  "Reserved (30)",                //  RESERVED                      = 30 | MAX_BIT\r
+  "End of File",                  //  RETURN_END_OF_FILE            = 31 | MAX_BIT\r
+  "Invalid Language",             //  RETURN_INVALID_LANGUAGE       = 32 | MAX_BIT\r
+  "Compromised Data"              //  RETURN_COMPROMISED_DATA       = 33 | MAX_BIT\r
 };\r
 \r
 \r
@@ -517,6 +527,9 @@ BasePrintLibSPrintMarker (
         if (sizeof (VOID *) > 4) {\r
           Flags |= LONG_TYPE;\r
         }\r
+        //\r
+        // break skipped on purpose\r
+        //\r
       case 'X':\r
         Flags |= PREFIX_ZERO;\r
         //\r
@@ -982,7 +995,10 @@ BasePrintLibSPrint (
   )\r
 {\r
   VA_LIST  Marker;\r
+  UINTN    NumberOfPrinted;\r
 \r
   VA_START (Marker, FormatString);\r
-  return BasePrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);\r
+  NumberOfPrinted = BasePrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);\r
+  VA_END (Marker);\r
+  return NumberOfPrinted;\r
 }\r