wcsmbs: optimize wcsncpy

This patch rewrites wcsncpy using wcsnlen, wmemset, and wmemcpy.  This is
similar to the optimization done on strncpy by f6482cf29d and 6423d4754c.

Checked on x86_64-linux-gnu.

	* wcsmbs/wcsncpy.c (__wcsncpy): Rewrite using wcsnlen, wmemset, and
	wmemcpy.

diff --git a/ChangeLog b/ChangeLog
index d51188cda98a69be1a72fc3a81450a7f9622f27a..97e70aa0cb40ff17990e34c9b5ac04d64240580d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-02-27  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * wcsmbs/wcsncpy.c (__wcsncpy): Rewrite using wcsnlen, wmemset, and
+       wmemcpy.
+
        * wcsmbs/wcsncat.c (wcsncat): Rewrite using wcslen, wcsnlen, and
        wmemcpy.
 

diff --git a/wcsmbs/wcsncpy.c b/wcsmbs/wcsncpy.c
index 2fd523c81564d3e5f849189669a407253ab7941e..d5d7f4ad862e4e8915c7bce371669768a16f7919 100644 (file)
--- a/wcsmbs/wcsncpy.c
+++ b/wcsmbs/wcsncpy.c
@@ -26,62 +26,10 @@
 wchar_t *
 __wcsncpy (wchar_t *dest, const wchar_t *src, size_t n)
 {
-  wint_t c;
-  wchar_t *const s = dest;
-
-  --dest;
-
-  if (n >= 4)
-    {
-      size_t n4 = n >> 2;
-
-      for (;;)
-       {
-         c = *src++;
-         *++dest = c;
-         if (c == L'\0')
-           break;
-         c = *src++;
-         *++dest = c;
-         if (c == L'\0')
-           break;
-         c = *src++;
-         *++dest = c;
-         if (c == L'\0')
-           break;
-         c = *src++;
-         *++dest = c;
-         if (c == L'\0')
-           break;
-         if (--n4 == 0)
-           goto last_chars;
-       }
-      n = n - (dest - s) - 1;
-      if (n == 0)
-       return s;
-      goto zero_fill;
-    }
-
- last_chars:
-  n &= 3;
-  if (n == 0)
-    return s;
-
-  do
-    {
-      c = *src++;
-      *++dest = c;
-      if (--n == 0)
-       return s;
-    }
-  while (c != L'\0');
-
- zero_fill:
-  do
-    *++dest = L'\0';
-  while (--n > 0);
-
-  return s;
+  size_t size = __wcsnlen (src, n);
+  if (size != n)
+    __wmemset (dest + size, L'\0', n - size);
+  return __wmemcpy (dest, src, size);
 }
 #ifndef WCSNCPY
 weak_alias (__wcsncpy, wcsncpy)