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.43; helo=mga05.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 6B79D210C515E for ; Mon, 30 Jul 2018 10:47:04 -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 fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jul 2018 10:47:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,422,1526367600"; d="scan'208";a="68689185" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 30 Jul 2018 10:46:57 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 30 Jul 2018 10:46:57 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.106]) by fmsmsx101.amr.corp.intel.com ([169.254.1.223]) with mapi id 14.03.0319.002; Mon, 30 Jul 2018 10:46:57 -0700 From: "Carsey, Jaben" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: Alexei Fedorov , "Ni, Ruiyu" Thread-Topic: [patch 2/4] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2012 build failure Thread-Index: AQHUJ6zgCsQxShdRBESR0GKuYk3VVKSoCz9w Date: Mon, 30 Jul 2018 17:46:56 +0000 Message-ID: References: <20180730022703.101708-1-dandan.bi@intel.com> <20180730022703.101708-3-dandan.bi@intel.com> In-Reply-To: <20180730022703.101708-3-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNTFhOGQ5NWYtNTJiZi00Y2ExLWE2MzAtZTE5N2E1OGM1ZDM0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZVFucnpvXC83Z3dpNWdTYUtjTkdyMEg1MDdRNUNPbExwdFwvSzRkWGZoTnlPcGozTExsejFuQVFpcDc2TklRalB4In0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.1.200.108] MIME-Version: 1.0 Subject: Re: [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 17:47:04 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey > -----Original Message----- > From: Bi, Dandan > Sent: Sunday, July 29, 2018 7:27 PM > To: edk2-devel@lists.01.org > Cc: Alexei Fedorov ; Ni, Ruiyu > ; Carsey, Jaben > Subject: [patch 2/4] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2012 > build failure > Importance: High >=20 > Fix following build error: > UefiShellAcpiViewCommandLib\AcpiParser.c(519) : > error C2308: concatenating mismatched strings > Concatenating wide "ERROR: %a: Offset Mismatch for %s" > with narrow "CurrentOffset =3D %d FieldOffset =3D %d" >=20 > 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(-) >=20 > 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 ( >=20 > if (Offset !=3D Parser[Index].Offset) { > IncrementErrorCount (); > Print ( > L"\nERROR: %a: Offset Mismatch for %s\n" > - "CurrentOffset =3D %d FieldOffset =3D %d\n", > + L"CurrentOffset =3D %d FieldOffset =3D %d\n", > AsciiName, > Parser[Index].NameStr, > Offset, > Parser[Index].Offset > ); > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parse > r.c > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parse > r.c > index bc8b7b00e3..e6185d2755 100644 > --- > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parse > r.c > +++ > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parse > r.c > @@ -118,11 +118,11 @@ ValidateNameSpaceStrLen ( >=20 > if (NameSpaceStrLen < 2) { > IncrementErrorCount (); > Print ( > L"\nERROR: NamespaceString Length =3D %d. If no Namespace device > exists,\n" > - " then NamespaceString[] must contain a period '.'", > + L" then NamespaceString[] must contain a period '.'", > NameSpaceStrLen > ); > } > } >=20 > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPars > er.c > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPars > er.c > index a704b0c631..999ac698ec 100644 > --- > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPars > er.c > +++ > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPars > er.c > @@ -229,11 +229,11 @@ ParseAcpiMadt ( > if (((Offset + (*MadtInterruptControllerLength)) > AcpiTableLength) = || > (*MadtInterruptControllerLength < 4)) { > IncrementErrorCount (); > Print ( > L"ERROR: Invalid Interrupt Controller Length," > - " Type =3D %d, Length =3D %d\n", > + L" Type =3D %d, Length =3D %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 =3D %d\n", > + L" GICDCount =3D %d\n", > GICDCount > ); > } > ParseAcpi ( > TRUE, > @@ -309,11 +309,11 @@ ParseAcpiMadt ( >=20 > default: { > IncrementErrorCount (); > Print ( > L"ERROR: Unknown Interrupt Controller Structure," > - " Type =3D %d, Length =3D %d\n", > + L" Type =3D %d, Length =3D %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 =3D=3D Index) && (SLIT_ELEMENT (LocalityPtr, Count,Inde= x) !=3D 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) !=3D > SLIT_ELEMENT (LocalityPtr, Index, Count)) { > IncrementErrorCount (); > Print ( > L"ERROR: Relative distances for Element[0x%lx][0x%lx] (%3d) an= d \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