From 7b3fb620519f6887b2650cc8e0e3267e44914c7b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 5 Feb 2019 17:34:05 -0200 Subject: 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. --- wcsmbs/wcpcpy.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'wcsmbs') 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 -#define __need_ptrdiff_t -#include - #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 -- cgit v1.2.3