Revision: 14387
http://edk2.svn.sourceforge.net/edk2/?rev=14387&view=rev
Author: lgao4
Date: 2013-05-24 02:48:40 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Without this fix, the "%r" format specifier prints eg. "0000001A" instead of
"Security Violation" for EFI_SECURITY_VIOLATION.
Signed-off-by: Gary Ching-Pang Lin <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
trunk/edk2/MdePkg/Library/BasePrintLib/PrintLibInternal.c
Modified:
trunk/edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
===================================================================
---
trunk/edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
2013-05-23 02:56:41 UTC (rev 14386)
+++
trunk/edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
2013-05-24 02:48:40 UTC (rev 14387)
@@ -23,7 +23,7 @@
#include "PrintLibInternal.h"
#define WARNING_STATUS_NUMBER 4
-#define ERROR_STATUS_NUMBER 24
+#define ERROR_STATUS_NUMBER 31
#define ASSERT_UNICODE_BUFFER(Buffer) ASSERT ((((UINTN) (Buffer)) & 0x01) == 0)
GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *StatusString [] = {
@@ -56,6 +56,13 @@
"ICMP Error", // RETURN_ICMP_ERROR = 22 |
MAX_BIT
"TFTP Error", // RETURN_TFTP_ERROR = 23 |
MAX_BIT
"Protocol Error" // RETURN_PROTOCOL_ERROR = 24 |
MAX_BIT
+ "Incompatible Version", // RETURN_INCOMPATIBLE_VERSION = 25 |
MAX_BIT
+ "Security Violation", // RETURN_SECURITY_VIOLATION = 26 |
MAX_BIT
+ "CRC Error", // RETURN_CRC_ERROR = 27 |
MAX_BIT
+ "End of Media", // RETURN_END_OF_MEDIA = 28 |
MAX_BIT
+ "Reserved (29)", // RESERVED = 29 |
MAX_BIT
+ "Reserved (30)", // RESERVED = 30 |
MAX_BIT
+ "End of File" // RETURN_END_OF_FILE = 31 |
MAX_BIT
};
/**
Modified: trunk/edk2/MdePkg/Library/BasePrintLib/PrintLibInternal.c
===================================================================
--- trunk/edk2/MdePkg/Library/BasePrintLib/PrintLibInternal.c 2013-05-23
02:56:41 UTC (rev 14386)
+++ trunk/edk2/MdePkg/Library/BasePrintLib/PrintLibInternal.c 2013-05-24
02:48:40 UTC (rev 14387)
@@ -14,8 +14,8 @@
#include "PrintLibInternal.h"
-#define WARNING_STATUS_NUMBER 4
-#define ERROR_STATUS_NUMBER 24
+#define WARNING_STATUS_NUMBER 5
+#define ERROR_STATUS_NUMBER 33
GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mHexStr[] =
{'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
@@ -25,6 +25,7 @@
"Warning Delete Failure", // RETURN_WARN_DELETE_FAILURE = 2
"Warning Write Failure", // RETURN_WARN_WRITE_FAILURE = 3
"Warning Buffer Too Small", // RETURN_WARN_BUFFER_TOO_SMALL = 4
+ "Warning Stale Data", // RETURN_WARN_STALE_DATA = 5
"Load Error", // RETURN_LOAD_ERROR = 1 |
MAX_BIT
"Invalid Parameter", // RETURN_INVALID_PARAMETER = 2 |
MAX_BIT
"Unsupported", // RETURN_UNSUPPORTED = 3 |
MAX_BIT
@@ -49,6 +50,15 @@
"ICMP Error", // RETURN_ICMP_ERROR = 22 |
MAX_BIT
"TFTP Error", // RETURN_TFTP_ERROR = 23 |
MAX_BIT
"Protocol Error" // RETURN_PROTOCOL_ERROR = 24 |
MAX_BIT
+ "Incompatible Version", // RETURN_INCOMPATIBLE_VERSION = 25 |
MAX_BIT
+ "Security Violation", // RETURN_SECURITY_VIOLATION = 26 |
MAX_BIT
+ "CRC Error", // RETURN_CRC_ERROR = 27 |
MAX_BIT
+ "End of Media", // RETURN_END_OF_MEDIA = 28 |
MAX_BIT
+ "Reserved (29)", // RESERVED = 29 |
MAX_BIT
+ "Reserved (30)", // RESERVED = 30 |
MAX_BIT
+ "End of File", // RETURN_END_OF_FILE = 31 |
MAX_BIT
+ "Invalid Language", // RETURN_INVALID_LANGUAGE = 32 |
MAX_BIT
+ "Compromised Data" // RETURN_COMPROMISED_DATA = 33 |
MAX_BIT
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
