From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 BDE32803D3 for ; Sun, 19 Mar 2017 19:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1489976195; x=1521512195; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ovjfp0xkvxml79nVQdFiIwKHA4oeDBQW10mFUfQyAmI=; b=cKp6CSE3cgZQt3MppExYGLNWFsImVB9IND3FUJ2wfJYRnyZaLWLRcu7O HENR8p9CDpi6dpMXlwlZYMaZ950+SQ==; Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Mar 2017 19:16:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,191,1486454400"; d="scan'208";a="77186950" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 19 Mar 2017 19:16:29 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 19 Mar 2017 19:16:29 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 19 Mar 2017 19:16:29 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.177]) with mapi id 14.03.0248.002; Mon, 20 Mar 2017 10:16:24 +0800 From: "Zeng, Star" To: Laszlo Ersek , edk2-devel-01 CC: Ard Biesheuvel , "Tian, Feng" , "Wu, Hao A" , Leif Lindholm , "Zeng, Star" Thread-Topic: [PATCH v2 03/12] MdeModulePkg/RamDiskDxe: fix C string literal catenation in info messages Thread-Index: AQHSn1+9w7OyBAKAzEao+BFn2JBHJaGdAOCA Date: Mon, 20 Mar 2017 02:16:24 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B835B1D@shsmsx102.ccr.corp.intel.com> References: <20170317204731.31488-1-lersek@redhat.com> <20170317204731.31488-4-lersek@redhat.com> In-Reply-To: <20170317204731.31488-4-lersek@redhat.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 03/12] MdeModulePkg/RamDiskDxe: fix C string literal catenation in info messages X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 02:16:35 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I am ok with this patch. Feng and Hao, do you have any comments? Thanks, Star -----Original Message----- From: Laszlo Ersek [mailto:lersek@redhat.com]=20 Sent: Saturday, March 18, 2017 4:47 AM To: edk2-devel-01 Cc: Ard Biesheuvel ; Tian, Feng ; Wu, Hao A ; Leif Lindholm ; Zeng, Star Subject: [PATCH v2 03/12] MdeModulePkg/RamDiskDxe: fix C string literal cat= enation in info messages RamDiskDxe installs the RamDiskAcpiCheck() Ready To Boot callback function.= If EFI_ACPI_TABLE_PROTOCOL and/or EFI_ACPI_SDT_PROTOCOL are not found, the= n informational messages are logged, and the RAM disks are not published to= the (nonexistent) NFIT table. The logic is fine, but the info messages are not concatenated correctly fro= m multiple string literals -- the second parts are passed as (unused) argum= ents to DEBUG(). Fix the typos. Cc: Ard Biesheuvel Cc: Feng Tian Cc: Hao Wu Cc: Leif Lindholm Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c b/MdeMo= dulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c index d1dd13a8197b..b2bafc58bb71 100644 --- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c +++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c @@ -74,7 +74,7 @@ RamDiskAcpiCheck ( if (EFI_ERROR (Status)) { DEBUG (( EFI_D_INFO, - "RamDiskAcpiCheck: Cannot locate the EFI ACPI Table Protocol,", + "RamDiskAcpiCheck: Cannot locate the EFI ACPI Table Protocol, " "unable to publish RAM disks to NFIT.\n" )); return; @@ -91,7 +91,7 @@ RamDiskAcpiCheck ( if (EFI_ERROR (Status)) { DEBUG (( EFI_D_INFO, - "RamDiskAcpiCheck: Cannot locate the EFI ACPI Sdt Protocol,", + "RamDiskAcpiCheck: Cannot locate the EFI ACPI Sdt Protocol, " "unable to publish RAM disks to NFIT.\n" )); mAcpiTableProtocol =3D NULL; -- 2.9.3