From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=dandan.bi@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C70FC210C5146 for ; Sun, 29 Jul 2018 19:27:31 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 19:27:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,421,1526367600"; d="scan'208";a="68512553" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by FMSMGA003.fm.intel.com with ESMTP; 29 Jul 2018 19:27:30 -0700 From: Dandan Bi To: edk2-devel@lists.01.org Cc: Alexei Fedorov , Ruiyu Ni , Jaben Carsey Date: Mon, 30 Jul 2018 10:27:01 +0800 Message-Id: <20180730022703.101708-3-dandan.bi@intel.com> X-Mailer: git-send-email 2.14.3.windows.1 In-Reply-To: <20180730022703.101708-1-dandan.bi@intel.com> References: <20180730022703.101708-1-dandan.bi@intel.com> Subject: [patch 2/4] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2012 build failure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 02:27:32 -0000 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 cc: Ruiyu Ni cc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c | 2 +- .../Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c | 2 +- .../Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c | 6 +++--- .../Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c | 4 ++-- 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 @@ -514,11 +514,11 @@ ParseAcpi ( if (Offset != Parser[Index].Offset) { 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, Parser[Index].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 @@ -118,11 +118,11 @@ ValidateNameSpaceStrLen ( if (NameSpaceStrLen < 2) { 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 @@ -229,11 +229,11 @@ ParseAcpiMadt ( if (((Offset + (*MadtInterruptControllerLength)) > AcpiTableLength) || (*MadtInterruptControllerLength < 4)) { IncrementErrorCount (); Print ( L"ERROR: Invalid Interrupt Controller Length," - " Type = %d, Length = %d\n", + L" Type = %d, Length = %d\n", *MadtInterruptControllerType, *MadtInterruptControllerLength ); break; } @@ -254,11 +254,11 @@ ParseAcpiMadt ( case EFI_ACPI_6_2_GICD: { if (++GICDCount > 1) { IncrementErrorCount (); Print ( L"ERROR: Only one GICD must be present," - " GICDCount = %d\n", + L" GICDCount = %d\n", GICDCount ); } ParseAcpi ( TRUE, @@ -309,11 +309,11 @@ ParseAcpiMadt ( default: { IncrementErrorCount (); Print ( L"ERROR: Unknown Interrupt Controller Structure," - " Type = %d, Length = %d\n", + L" Type = %d, Length = %d\n", *MadtInterruptControllerType, *MadtInterruptControllerLength ); } } // switch 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 @@ -117,11 +117,11 @@ ParseAcpiSlit ( // Element[x][x] must be equal to 10 if ((Count == Index) && (SLIT_ELEMENT (LocalityPtr, Count,Index) != 10)) { 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) ); } @@ -129,11 +129,11 @@ ParseAcpiSlit ( if (SLIT_ELEMENT (LocalityPtr, Count, Index) != SLIT_ELEMENT (LocalityPtr, Index, Count)) { 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), Index, Count, -- 2.14.3.windows.1