summaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-02-05 17:34:05 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-02-27 10:00:34 -0300
commit7b3fb620519f6887b2650cc8e0e3267e44914c7b (patch)
tree6f79b02b90f468269045d821d23dd1f92e23bc66 /wcsmbs
parentaa0e46636a5b71b609a41e9ab97134cd76ac1522 (diff)
downloadglibc-7b3fb620519f6887b2650cc8e0e3267e44914c7b.tar.gz
wcsmbs: optimize wcpcpy
This patch rewrites wcpcpy using wcslen and wmemcpy. This is similar to the optimizatio done on stpcpy by f559d8cf29. Checked on x86_64-linux-gnu and string tests on a simulated m68k-linux-gnu. * sysdeps/m68k/wcpcpy.c: Remove file. * wcsmbs/wcpcpy.c (__wcpcpy): Rewrite using wcslen and wmemcpy.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wcpcpy.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/wcsmbs/wcpcpy.c b/wcsmbs/wcpcpy.c
index 01978e98f3..666fe150bc 100644
--- a/wcsmbs/wcpcpy.c
+++ b/wcsmbs/wcpcpy.c
@@ -18,31 +18,18 @@
#include <wchar.h>
-#define __need_ptrdiff_t
-#include <stddef.h>
-
#ifdef WCPCPY
# define __wcpcpy WCPCPY
#endif
+
/* Copy SRC to DEST, returning the address of the terminating L'\0' in
DEST. */
wchar_t *
__wcpcpy (wchar_t *dest, const wchar_t *src)
{
- wchar_t *wcp = (wchar_t *) dest - 1;
- wint_t c;
- const ptrdiff_t off = src - dest + 1;
-
- do
- {
- c = wcp[off];
- *++wcp = c;
- }
- while (c != L'\0');
-
- return wcp;
+ size_t len = __wcslen (src);
+ return __wmemcpy (dest, src, len + 1) + len;
}
-
#ifndef WCPCPY
weak_alias (__wcpcpy, wcpcpy)
#endif