From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 A924421E87982 for ; Wed, 13 Sep 2017 22:12:38 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Sep 2017 22:15:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,391,1500966000"; d="scan'208";a="149008702" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga005.jf.intel.com with ESMTP; 13 Sep 2017 22:15:36 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 13 Sep 2017 22:15:36 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 13 Sep 2017 22:15:36 -0700 Received: from shsmsx152.ccr.corp.intel.com ([169.254.6.93]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.168]) with mapi id 14.03.0319.002; Thu, 14 Sep 2017 13:15:34 +0800 From: "Wu, Jiaxin" To: "Fu, Siyuan" , "edk2-devel@lists.01.org" CC: "Ye, Ting" Thread-Topic: [Patch] NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword. Thread-Index: AQHTLQgJcF11XapcXkO3oBP+pTDH7aKz1tsQ Date: Thu, 14 Sep 2017 05:15:33 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B72741632C0B0@SHSMSX152.ccr.corp.intel.com> References: <20170914031740.7440-1-siyuan.fu@intel.com> In-Reply-To: <20170914031740.7440-1-siyuan.fu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNGFkYTExZmMtZTI0Zi00YjQ4LWJiNjUtNDc1YmNjYmIxYTgzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IndPd1JmcXY3RFdQWGpPUWZCXC83U2hDdXE1cmZTamE0TXd3Y2FzVXMwVEF3PSJ9 x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword. 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: Thu, 14 Sep 2017 05:12:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu Jiaxin > -----Original Message----- > From: Fu, Siyuan > Sent: Thursday, September 14, 2017 11:18 AM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Wu, Jiaxin > Subject: [Patch] NetworkPkg: Remove the redundant '/' in the end of > returned ISCSIMacAddr keyword. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Fu Siyuan > Cc: Ye Ting > Cc: Wu Jiaxin > --- > NetworkPkg/IScsiDxe/IScsiConfig.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) >=20 > diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c > b/NetworkPkg/IScsiDxe/IScsiConfig.c > index 498221a339..c0dd305ecf 100644 > --- a/NetworkPkg/IScsiDxe/IScsiConfig.c > +++ b/NetworkPkg/IScsiDxe/IScsiConfig.c > @@ -749,14 +749,15 @@ > IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( > } > CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, > ATTEMPT_NAME_LIST_SIZE); >=20 > + ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr)); > NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) { > NicInfo =3D NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link); > IScsiMacAddrToStr ( > - &NicInfo->PermanentAddress, > - NicInfo->HwAddressSize, > - NicInfo->VlanId, > - MacString > - ); > + &NicInfo->PermanentAddress, > + NicInfo->HwAddressSize, > + NicInfo->VlanId, > + MacString > + ); > CopyMem ( > IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr), > MacString, > @@ -764,7 +765,10 @@ > IScsiConvertAttemptConfigDataToIfrNvDataByKeyword ( > ); >=20 > *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) =3D = L'/'; > - } > + } > + if (StrLen (IfrNvData->ISCSIMacAddr) !=3D 0) { > + *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr) - 1) = =3D > L'\0'; > + } > } > } >=20 > -- > 2.13.0.windows.1