From a4faf336ea8e87d0b46e54ea64ce19c8574b69e5 Mon Sep 17 00:00:00 2001 From: "Fu, Siyuan" Date: Fri, 15 Aug 2014 05:33:34 +0000 Subject: 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 Reviewed-by: Yao, Jiewen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15810 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/Ip6Dxe/Ip6ConfigNv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'NetworkPkg/Ip6Dxe') diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c index 19328e6..1b878a5 100644 --- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c +++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c @@ -718,9 +718,9 @@ Ip6ConvertInterfaceInfoToString ( // Print the interface type. // if (IfInfo->IfType == Ip6InterfaceTypeEthernet) { - StrnCpy (PortString, IP6_ETHERNET, sizeof (PortString) / sizeof (CHAR16) - 1); + CopyMem (PortString, IP6_ETHERNET, sizeof (IP6_ETHERNET)); } else if (IfInfo->IfType == Ip6InterfaceTypeExperimentalEthernet) { - StrnCpy (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof (PortString) / sizeof (CHAR16) - 1); + CopyMem (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof (IP6_EXPERIMENTAL_ETHERNET)); } else { // // Refer to RFC1700, chapter Number Hardware Type. @@ -747,9 +747,9 @@ Ip6ConvertInterfaceInfoToString ( for (Index = 0; Index < IfInfo->HwAddressSize; Index++) { if (IfInfo->HwAddress.Addr[Index] < 0x10) { - StrnCpy (FormatString, L"0%x-", sizeof (FormatString) / sizeof (CHAR16) - 1); + CopyMem (FormatString, L"0%x-", sizeof (L"0%x-")); } else { - StrnCpy (FormatString, L"%x-", sizeof (FormatString) / sizeof (CHAR16) - 1); + CopyMem (FormatString, L"%x-", sizeof (L"%x-")); } Number = UnicodeSPrint ( -- cgit v1.1