* [Patch] NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword.
@ 2017-09-14 3:17 Fu Siyuan
2017-09-14 5:15 ` Wu, Jiaxin
0 siblings, 1 reply; 2+ messages in thread
From: Fu Siyuan @ 2017-09-14 3:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Ye Ting, Wu Jiaxin
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword.
2017-09-14 3:17 [Patch] NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword Fu Siyuan
@ 2017-09-14 5:15 ` Wu, Jiaxin
0 siblings, 0 replies; 2+ messages in thread
From: Wu, Jiaxin @ 2017-09-14 5:15 UTC (permalink / raw)
To: Fu, Siyuan, edk2-devel@lists.01.org; +Cc: Ye, Ting
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
> -----Original Message-----
> From: Fu, Siyuan
> Sent: Thursday, September 14, 2017 11:18 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [Patch] 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>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-14 5:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-14 3:17 [Patch] NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword Fu Siyuan
2017-09-14 5:15 ` Wu, Jiaxin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox