MdeModulePkg/DumpDynPcd: Remove unsupported format specifiers

Some print statements use format specifiers like %N/%H/%E/%B that are
only supported in the shell print functions. In the ordinary 'Print'
function they are just displayed as letters N/H/E/B.
Remove these unsupported format specifiers from the 'Print' statements
to fix the issue.

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

diff --git a/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c
index b8571c455650dc0444295b9d0e4855ff296d01cb..013198963ed6fdd3f179a30a65c781e22c8bf463 100644 (file)
--- a/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c
+++ b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c
@@ -361,7 +361,7 @@ DumpPcdInfo (
         Uint8 = mPiPcd->Get8 (TokenSpace, TokenNumber);\r
       }\r
 \r
-      Print (L"  Token = 0x%08x - Type = %H%-17s%N - Size = 0x%x - Value = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint8);\r
+      Print (L"  Token = 0x%08x - Type = %-17s - Size = 0x%x - Value = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint8);\r
       break;\r
     case EFI_PCD_TYPE_16:\r
       if (TokenSpace == NULL) {\r
@@ -370,7 +370,7 @@ DumpPcdInfo (
         Uint16 = mPiPcd->Get16 (TokenSpace, TokenNumber);\r
       }\r
 \r
-      Print (L"  Token = 0x%08x - Type = %H%-17s%N - Size = 0x%x - Value = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint16);\r
+      Print (L"  Token = 0x%08x - Type = %-17s - Size = 0x%x - Value = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint16);\r
       break;\r
     case EFI_PCD_TYPE_32:\r
       if (TokenSpace == NULL) {\r
@@ -379,7 +379,7 @@ DumpPcdInfo (
         Uint32 = mPiPcd->Get32 (TokenSpace, TokenNumber);\r
       }\r
 \r
-      Print (L"  Token = 0x%08x - Type = %H%-17s%N - Size = 0x%x - Value = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint32);\r
+      Print (L"  Token = 0x%08x - Type = %-17s - Size = 0x%x - Value = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint32);\r
       break;\r
     case EFI_PCD_TYPE_64:\r
       if (TokenSpace == NULL) {\r
@@ -388,7 +388,7 @@ DumpPcdInfo (
         Uint64 = mPiPcd->Get64 (TokenSpace, TokenNumber);\r
       }\r
 \r
-      Print (L"  Token = 0x%08x - Type = %H%-17s%N - Size = 0x%x - Value = 0x%lx\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint64);\r
+      Print (L"  Token = 0x%08x - Type = %-17s - Size = 0x%x - Value = 0x%lx\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint64);\r
       break;\r
     case EFI_PCD_TYPE_BOOL:\r
       if (TokenSpace == NULL) {\r
@@ -397,7 +397,7 @@ DumpPcdInfo (
         Boolean = mPiPcd->GetBool (TokenSpace, TokenNumber);\r
       }\r
 \r
-      Print (L"  Token = 0x%08x - Type = %H%-17s%N - Size = 0x%x - Value = %a\n", TokenNumber, RetString, PcdInfo->PcdSize, Boolean ? "TRUE" : "FALSE");\r
+      Print (L"  Token = 0x%08x - Type = %-17s - Size = 0x%x - Value = %a\n", TokenNumber, RetString, PcdInfo->PcdSize, Boolean ? "TRUE" : "FALSE");\r
       break;\r
     case EFI_PCD_TYPE_PTR:\r
       if (TokenSpace == NULL) {\r
@@ -406,7 +406,7 @@ DumpPcdInfo (
         PcdData = mPiPcd->GetPtr (TokenSpace, TokenNumber);\r
       }\r
 \r
-      Print (L"  Token = 0x%08x - Type = %H%-17s%N - Size = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize);\r
+      Print (L"  Token = 0x%08x - Type = %-17s - Size = 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize);\r
       DumpHex (2, 0, PcdInfo->PcdSize, PcdData);\r
       break;\r
     default:\r
@@ -509,7 +509,7 @@ ProcessPcd (
     //\r
     // The specified PCD is not found, print error.\r
     //\r
-    Print (L"%EError. %NNo matching PCD found: %s.\n", InputPcdName);\r
+    Print (L"Error. No matching PCD found: %s.\n", InputPcdName);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -548,25 +548,25 @@ DumpDynPcdMain (
 \r
   Status = gBS->LocateProtocol (&gEfiPcdProtocolGuid, NULL, (VOID **)&mPiPcd);\r
   if (EFI_ERROR (Status)) {\r
-    Print (L"DumpDynPcd: %EError. %NPI PCD protocol is not present.\n");\r
+    Print (L"DumpDynPcd: Error. PI PCD protocol is not present.\n");\r
     return Status;\r
   }\r
 \r
   Status = gBS->LocateProtocol (&gEfiGetPcdInfoProtocolGuid, NULL, (VOID **)&mPiPcdInfo);\r
   if (EFI_ERROR (Status)) {\r
-    Print (L"DumpDynPcd: %EError. %NPI PCD info protocol is not present.\n");\r
+    Print (L"DumpDynPcd: Error. PI PCD info protocol is not present.\n");\r
     return Status;\r
   }\r
 \r
   Status = gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **)&mPcd);\r
   if (EFI_ERROR (Status)) {\r
-    Print (L"DumpDynPcd: %EError. %NPCD protocol is not present.\n");\r
+    Print (L"DumpDynPcd: Error. PCD protocol is not present.\n");\r
     return Status;\r
   }\r
 \r
   Status = gBS->LocateProtocol (&gGetPcdInfoProtocolGuid, NULL, (VOID **)&mPcdInfo);\r
   if (EFI_ERROR (Status)) {\r
-    Print (L"DumpDynPcd: %EError. %NPCD info protocol is not present.\n");\r
+    Print (L"DumpDynPcd: Error. PCD info protocol is not present.\n");\r
     return Status;\r
   }\r
 \r
@@ -575,13 +575,13 @@ DumpDynPcdMain (
   //\r
   Status = GetArg ();\r
   if (EFI_ERROR (Status)) {\r
-    Print (L"DumpDynPcd: %EError. %NThe input parameters are not recognized.\n");\r
+    Print (L"DumpDynPcd: Error. The input parameters are not recognized.\n");\r
     Status = EFI_INVALID_PARAMETER;\r
     return Status;\r
   }\r
 \r
   if (Argc > 2) {\r
-    Print (L"DumpDynPcd: %EError. %NToo many arguments specified.\n");\r
+    Print (L"DumpDynPcd: Error. Too many arguments specified.\n");\r
     Status = EFI_INVALID_PARAMETER;\r
     return Status;\r
   }\r
@@ -600,7 +600,7 @@ DumpDynPcdMain (
       goto Done;\r
     } else {\r
       if (StrStr (Argv[1], L"-") != NULL) {\r
-        Print (L"DumpDynPcd: %EError. %NThe argument '%B%s%N' is invalid.\n", Argv[1]);\r
+        Print (L"DumpDynPcd: Error. The argument '%s' is invalid.\n", Argv[1]);\r
         goto Done;\r
       }\r
     }\r