From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 7321220958BD7 for ; Wed, 13 Sep 2017 20:14:45 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP; 13 Sep 2017 20:17:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,390,1500966000"; d="scan'208";a="900079235" Received: from sfu5-mobl.ccr.corp.intel.com ([10.239.193.42]) by FMSMGA003.fm.intel.com with ESMTP; 13 Sep 2017 20:17:42 -0700 From: Fu Siyuan To: edk2-devel@lists.01.org Cc: Ye Ting , Wu Jiaxin Date: Thu, 14 Sep 2017 11:17:40 +0800 Message-Id: <20170914031740.7440-1-siyuan.fu@intel.com> X-Mailer: git-send-email 2.13.0.windows.1 Subject: [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 03:14:45 -0000 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(-) 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); + ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr)); NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) { NicInfo = 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 ( ); *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/'; - } + } + if (StrLen (IfrNvData->ISCSIMacAddr) != 0) { + *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr) - 1) = L'\0'; + } } } -- 2.13.0.windows.1