ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2012 build failure

Fix following build error:
UefiShellAcpiViewCommandLib\AcpiParser.c(519) :
error C2308: concatenating mismatched strings
Concatenating wide "ERROR: %a: Offset Mismatch for %s"
with narrow "CurrentOffset = %d FieldOffset = %d"

cc: Alexei Fedorov <Alexei.Fedorov@arm.com>
cc: Ruiyu Ni <ruiyu.ni@intel.com>
cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
index 630c41b71d28cab70ac5e9344de4e55358a7f694..18c4983e9524f4d48502bd9c3260deaba1f35edf 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
@@ -516,7 +516,7 @@ ParseAcpi (
       IncrementErrorCount ();\r
       Print (\r
         L"\nERROR: %a: Offset Mismatch for %s\n"\r
-          "CurrentOffset = %d FieldOffset = %d\n",\r
+          L"CurrentOffset = %d FieldOffset = %d\n",\r
         AsciiName,\r
         Parser[Index].NameStr,\r
         Offset,\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
index bc8b7b00e38215d18577f48a8d2349a1c6a27f0f..e6185d27551ee5daa257beebc7ff88d4eaba7a53 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
@@ -120,7 +120,7 @@ ValidateNameSpaceStrLen (
     IncrementErrorCount ();\r
     Print (\r
       L"\nERROR: NamespaceString Length = %d. If no Namespace device exists,\n"\r
-       "    then NamespaceString[] must contain a period '.'",\r
+       L"    then NamespaceString[] must contain a period '.'",\r
       NameSpaceStrLen\r
       );\r
   }\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
index a704b0c6314d2fa2da1c218f2fc644f464e99a7a..999ac698ec1fdd60ca39dfd79e584a01c83a961d 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
@@ -231,7 +231,7 @@ ParseAcpiMadt (
       IncrementErrorCount ();\r
       Print (\r
          L"ERROR: Invalid Interrupt Controller Length,"\r
-          " Type = %d, Length = %d\n",\r
+          L" Type = %d, Length = %d\n",\r
          *MadtInterruptControllerType,\r
          *MadtInterruptControllerLength\r
          );\r
@@ -256,7 +256,7 @@ ParseAcpiMadt (
           IncrementErrorCount ();\r
           Print (\r
             L"ERROR: Only one GICD must be present,"\r
-              " GICDCount = %d\n",\r
+              L" GICDCount = %d\n",\r
             GICDCount\r
             );\r
         }\r
@@ -311,7 +311,7 @@ ParseAcpiMadt (
         IncrementErrorCount ();\r
         Print (\r
           L"ERROR: Unknown Interrupt Controller Structure,"\r
-            " Type = %d, Length = %d\n",\r
+            L" Type = %d, Length = %d\n",\r
           *MadtInterruptControllerType,\r
           *MadtInterruptControllerLength\r
           );\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
index c38666d2b7f6839f6b860b5931f7c4d66d422d36..6496a3d624ce9a83a29f3751adc88b8ee80123a8 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
@@ -119,7 +119,7 @@ ParseAcpiSlit (
         IncrementErrorCount ();\r
         Print (\r
           L"ERROR: Diagonal Element[0x%lx][0x%lx] (%3d)."\r
-            " Normalized Value is not 10\n",\r
+            L" Normalized Value is not 10\n",\r
           Count,\r
           Index,\r
           SLIT_ELEMENT (LocalityPtr, Count, Index)\r
@@ -131,7 +131,7 @@ ParseAcpiSlit (
         IncrementErrorCount ();\r
         Print (\r
           L"ERROR: Relative distances for Element[0x%lx][0x%lx] (%3d) and \n"\r
-           "Element[0x%lx][0x%lx] (%3d) do not match.\n",\r
+           L"Element[0x%lx][0x%lx] (%3d) do not match.\n",\r
           Count,\r
           Index,\r
           SLIT_ELEMENT (LocalityPtr, Count, Index),\r