sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2012 build failure

Browse Source 
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>
This commit is contained in:
Dandan Bi
2018-07-30 09:31:36 +08:00
committed by Eric Dong
parent ed8746801e
commit e6f958d15d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
View File

@ -516,7 +516,7 @@ ParseAcpi (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"\nERROR: %a: Offset Mismatch for %s\n" L"\nERROR: %a: Offset Mismatch for %s\n"
"CurrentOffset = %d FieldOffset = %d\n", L"CurrentOffset = %d FieldOffset = %d\n",
AsciiName, AsciiName,
Parser[Index].NameStr, Parser[Index].NameStr,
Offset, Offset,

2
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
View File

@ -120,7 +120,7 @@ ValidateNameSpaceStrLen (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"\nERROR: NamespaceString Length = %d. If no Namespace device exists,\n" 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 NameSpaceStrLen
); );
} }

6
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
View File

@ -231,7 +231,7 @@ ParseAcpiMadt (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"ERROR: Invalid Interrupt Controller Length," L"ERROR: Invalid Interrupt Controller Length,"
" Type = %d, Length = %d\n", L" Type = %d, Length = %d\n",
*MadtInterruptControllerType, *MadtInterruptControllerType,
*MadtInterruptControllerLength *MadtInterruptControllerLength
); );
@ -256,7 +256,7 @@ ParseAcpiMadt (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"ERROR: Only one GICD must be present," L"ERROR: Only one GICD must be present,"
" GICDCount = %d\n", L" GICDCount = %d\n",
GICDCount GICDCount
); );
} }
@ -311,7 +311,7 @@ ParseAcpiMadt (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"ERROR: Unknown Interrupt Controller Structure," L"ERROR: Unknown Interrupt Controller Structure,"
" Type = %d, Length = %d\n", L" Type = %d, Length = %d\n",
*MadtInterruptControllerType, *MadtInterruptControllerType,
*MadtInterruptControllerLength *MadtInterruptControllerLength
); );

4
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
View File

@ -119,7 +119,7 @@ ParseAcpiSlit (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"ERROR: Diagonal Element[0x%lx][0x%lx] (%3d)." L"ERROR: Diagonal Element[0x%lx][0x%lx] (%3d)."
" Normalized Value is not 10\n", L" Normalized Value is not 10\n",
Count, Count,
Index, Index,
SLIT_ELEMENT (LocalityPtr, Count, Index) SLIT_ELEMENT (LocalityPtr, Count, Index)
@ -131,7 +131,7 @@ ParseAcpiSlit (
IncrementErrorCount (); IncrementErrorCount ();
Print ( Print (
L"ERROR: Relative distances for Element[0x%lx][0x%lx] (%3d) and \n" 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, Count,
Index, Index,
SLIT_ELEMENT (LocalityPtr, Count, Index), SLIT_ELEMENT (LocalityPtr, Count, Index),