summaryrefslogtreecommitdiffstats
path: root/NetworkPkg/IScsiDxe/IScsiMisc.c
diff options
context:
space:
mode:
authorFu, Siyuan <siyuan.fu@intel.com>2014-08-15 05:33:34 +0000
committersfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-15 05:33:34 +0000
commita4faf336ea8e87d0b46e54ea64ce19c8574b69e5 (patch)
tree384ccfaa148969a83d92b233342d9e416861354e /NetworkPkg/IScsiDxe/IScsiMisc.c
parent1be2ed90a20618d71ddf34b8a07d038da0b36854 (diff)
downloadedk2-a4faf336ea8e87d0b46e54ea64ce19c8574b69e5.tar.gz
edk2-a4faf336ea8e87d0b46e54ea64ce19c8574b69e5.tar.bz2
edk2-a4faf336ea8e87d0b46e54ea64ce19c8574b69e5.zip
Use string pointer instead string buffer to avoid string copy operation.
Use CopyMem() to guarantee the NULL terminal will always be appended to the destination string. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu, Siyuan <siyuan.fu@intel.com> Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15810 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'NetworkPkg/IScsiDxe/IScsiMisc.c')
-rw-r--r--NetworkPkg/IScsiDxe/IScsiMisc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index 1968cc9370..05f639aaee 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -209,7 +209,7 @@ IScsiLunToUnicodeStr (
for (Index = 0; Index < 4; Index++) {
if ((Lun[2 * Index] | Lun[2 * Index + 1]) == 0) {
- StrnCpy (TempStr, L"0-", StrLen (L"0-"));
+ CopyMem (TempStr, L"0-", sizeof (L"0-"));
} else {
TempStr[0] = (CHAR16) IScsiHexString[Lun[2 * Index] >> 4];
TempStr[1] = (CHAR16) IScsiHexString[Lun[2 * Index] & 0x0F];
@@ -223,7 +223,9 @@ IScsiLunToUnicodeStr (
TempStr += StrLen (TempStr);
}
-
+ //
+ // Remove the last '-'
+ //
Str[StrLen (Str) - 1] = 0;
for (Index = StrLen (Str) - 1; Index > 1; Index = Index - 2) {