diff options
author | Fu Siyuan <siyuan.fu@intel.com> | 2017-09-14 11:13:05 +0800 |
---|---|---|
committer | Fu Siyuan <siyuan.fu@intel.com> | 2017-09-18 09:43:11 +0800 |
commit | fbfe64203be8af6929c4e8c88500ea07689ea39e (patch) | |
tree | 40c968cccde135a3f6584263e2961908cb7afaed /NetworkPkg | |
parent | 4084ccfa22dab15e2b9c3f531ba9ec18a6e08a8d (diff) | |
download | edk2-fbfe64203be8af6929c4e8c88500ea07689ea39e.tar.gz edk2-fbfe64203be8af6929c4e8c88500ea07689ea39e.tar.bz2 edk2-fbfe64203be8af6929c4e8c88500ea07689ea39e.zip |
NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Diffstat (limited to 'NetworkPkg')
-rw-r--r-- | NetworkPkg/IScsiDxe/IScsiConfig.c | 16 |
1 files 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';
+ }
}
}
|