diff options
| author | Dandan Bi <dandan.bi@intel.com> | 2018-07-30 09:31:36 +0800 |
|---|---|---|
| committer | Eric Dong <eric.dong@intel.com> | 2018-08-01 09:00:40 +0800 |
| commit | e6f958d15d710da19dca3fb38943d83f1b3532d6 (patch) | |
| tree | 9feb98817c31f121f2791ff60476e87393ea92da /ShellPkg/Library | |
| parent | ed8746801e0d9a5fc5fec006efdedac1c09e7bbf (diff) | |
| download | edk2-e6f958d15d710da19dca3fb38943d83f1b3532d6.tar.gz edk2-e6f958d15d710da19dca3fb38943d83f1b3532d6.tar.bz2 edk2-e6f958d15d710da19dca3fb38943d83f1b3532d6.zip | |
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>
Diffstat (limited to 'ShellPkg/Library')
4 files changed, 7 insertions, 7 deletions
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c index 630c41b71d..18c4983e95 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c @@ -516,7 +516,7 @@ ParseAcpi ( IncrementErrorCount ();
Print (
L"\nERROR: %a: Offset Mismatch for %s\n"
- "CurrentOffset = %d FieldOffset = %d\n",
+ L"CurrentOffset = %d FieldOffset = %d\n",
AsciiName,
Parser[Index].NameStr,
Offset,
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c index bc8b7b00e3..e6185d2755 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c @@ -120,7 +120,7 @@ ValidateNameSpaceStrLen ( IncrementErrorCount ();
Print (
L"\nERROR: NamespaceString Length = %d. If no Namespace device exists,\n"
- " then NamespaceString[] must contain a period '.'",
+ L" then NamespaceString[] must contain a period '.'",
NameSpaceStrLen
);
}
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c index a704b0c631..999ac698ec 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c @@ -231,7 +231,7 @@ ParseAcpiMadt ( IncrementErrorCount ();
Print (
L"ERROR: Invalid Interrupt Controller Length,"
- " Type = %d, Length = %d\n",
+ L" Type = %d, Length = %d\n",
*MadtInterruptControllerType,
*MadtInterruptControllerLength
);
@@ -256,7 +256,7 @@ ParseAcpiMadt ( IncrementErrorCount ();
Print (
L"ERROR: Only one GICD must be present,"
- " GICDCount = %d\n",
+ L" GICDCount = %d\n",
GICDCount
);
}
@@ -311,7 +311,7 @@ ParseAcpiMadt ( IncrementErrorCount ();
Print (
L"ERROR: Unknown Interrupt Controller Structure,"
- " Type = %d, Length = %d\n",
+ L" Type = %d, Length = %d\n",
*MadtInterruptControllerType,
*MadtInterruptControllerLength
);
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c index c38666d2b7..6496a3d624 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c @@ -119,7 +119,7 @@ ParseAcpiSlit ( IncrementErrorCount ();
Print (
L"ERROR: Diagonal Element[0x%lx][0x%lx] (%3d)."
- " Normalized Value is not 10\n",
+ L" Normalized Value is not 10\n",
Count,
Index,
SLIT_ELEMENT (LocalityPtr, Count, Index)
@@ -131,7 +131,7 @@ ParseAcpiSlit ( IncrementErrorCount ();
Print (
L"ERROR: Relative distances for Element[0x%lx][0x%lx] (%3d) and \n"
- "Element[0x%lx][0x%lx] (%3d) do not match.\n",
+ L"Element[0x%lx][0x%lx] (%3d) do not match.\n",
Count,
Index,
SLIT_ELEMENT (LocalityPtr, Count, Index),
|