| Index: fusl/src/string/memmove.c
|
| diff --git a/fusl/src/string/memmove.c b/fusl/src/string/memmove.c
|
| index 27f670e1a31fe860ff6ce17a453559ef42706aeb..03aae1ce9e0486e934c3c0731fd448f394d52cd7 100644
|
| --- a/fusl/src/string/memmove.c
|
| +++ b/fusl/src/string/memmove.c
|
| @@ -4,33 +4,40 @@
|
| #define WT size_t
|
| #define WS (sizeof(WT))
|
|
|
| -void *memmove(void *dest, const void *src, size_t n)
|
| -{
|
| - char *d = dest;
|
| - const char *s = src;
|
| +void* memmove(void* dest, const void* src, size_t n) {
|
| + char* d = dest;
|
| + const char* s = src;
|
|
|
| - if (d==s) return d;
|
| - if (s+n <= d || d+n <= s) return memcpy(d, s, n);
|
| + if (d == s)
|
| + return d;
|
| + if (s + n <= d || d + n <= s)
|
| + return memcpy(d, s, n);
|
|
|
| - if (d<s) {
|
| - if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
|
| - while ((uintptr_t)d % WS) {
|
| - if (!n--) return dest;
|
| - *d++ = *s++;
|
| - }
|
| - for (; n>=WS; n-=WS, d+=WS, s+=WS) *(WT *)d = *(WT *)s;
|
| - }
|
| - for (; n; n--) *d++ = *s++;
|
| - } else {
|
| - if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
|
| - while ((uintptr_t)(d+n) % WS) {
|
| - if (!n--) return dest;
|
| - d[n] = s[n];
|
| - }
|
| - while (n>=WS) n-=WS, *(WT *)(d+n) = *(WT *)(s+n);
|
| - }
|
| - while (n) n--, d[n] = s[n];
|
| - }
|
| + if (d < s) {
|
| + if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
|
| + while ((uintptr_t)d % WS) {
|
| + if (!n--)
|
| + return dest;
|
| + *d++ = *s++;
|
| + }
|
| + for (; n >= WS; n -= WS, d += WS, s += WS)
|
| + *(WT*)d = *(WT*)s;
|
| + }
|
| + for (; n; n--)
|
| + *d++ = *s++;
|
| + } else {
|
| + if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
|
| + while ((uintptr_t)(d + n) % WS) {
|
| + if (!n--)
|
| + return dest;
|
| + d[n] = s[n];
|
| + }
|
| + while (n >= WS)
|
| + n -= WS, *(WT*)(d + n) = *(WT*)(s + n);
|
| + }
|
| + while (n)
|
| + n--, d[n] = s[n];
|
| + }
|
|
|
| - return dest;
|
| + return dest;
|
| }
|
|
|