use wrapper headers to hide most namespaced/internally-public symbols

[musl] / src / string / memccpy.c

diff --git a/src/string/memccpy.c b/src/string/memccpy.c
index 4a875cf..7c233d5 100644 (file)
--- a/src/string/memccpy.c
+++ b/src/string/memccpy.c
@@ -1,5 +1,4 @@
 #include <string.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>
 
@@ -8,7 +7,7 @@
 #define HIGHS (ONES * (UCHAR_MAX/2+1))
 #define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
 
-void *memccpy(void *dest, const void *src, int c, size_t n)
+void *memccpy(void *restrict dest, const void *restrict src, int c, size_t n)
 {
        unsigned char *d = dest;
        const unsigned char *s = src;
@@ -22,7 +21,7 @@ void *memccpy(void *dest, const void *src, int c, size_t n)
                k = ONES * c;
                wd=(void *)d; ws=(const void *)s;
                for (; n>=sizeof(size_t) && !HASZERO(*ws^k);
-                      n-=sizeof(size_t), ws++, *wd++) *wd = *ws;
+                      n-=sizeof(size_t), ws++, wd++) *wd = *ws;
                d=(void *)wd; s=(const void *)ws;
        }
        for (; n && (*d=*s)!=c; n--, s++, d++);