summaryrefslogtreecommitdiff
path: root/libc/string/generic
diff options
context:
space:
mode:
Diffstat (limited to 'libc/string/generic')
-rw-r--r--libc/string/generic/memmem.c2
-rw-r--r--libc/string/generic/memmove.c4
-rw-r--r--libc/string/generic/mempcpy.c7
-rw-r--r--libc/string/generic/strcspn.c2
-rw-r--r--libc/string/generic/strrchr.c4
-rw-r--r--libc/string/generic/strsep.c2
6 files changed, 9 insertions, 12 deletions
diff --git a/libc/string/generic/memmem.c b/libc/string/generic/memmem.c
index 5f2c1e244..05d7de639 100644
--- a/libc/string/generic/memmem.c
+++ b/libc/string/generic/memmem.c
@@ -41,7 +41,7 @@ void attribute_hidden *__memmem (const void *haystack, size_t haystack_len,
for (begin = (const char *) haystack; begin <= last_possible; ++begin)
if (begin[0] == ((const char *) needle)[0] &&
- !memcmp ((const void *) &begin[1],
+ !__memcmp ((const void *) &begin[1],
(const void *) ((const char *) needle + 1),
needle_len - 1))
return (void *) begin;
diff --git a/libc/string/generic/memmove.c b/libc/string/generic/memmove.c
index a2c38a9b5..0e649a1a9 100644
--- a/libc/string/generic/memmove.c
+++ b/libc/string/generic/memmove.c
@@ -19,8 +19,6 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#define memcpy __memcpy
-
#include <string.h>
#include "memcopy.h"
@@ -221,7 +219,7 @@ void attribute_hidden *__memmove (void *dest, const void *src, size_t len)
{
#if 1
#warning REMINDER: generic-opt memmove assumes memcpy does forward copying!
- memcpy(dest, src, len);
+ __memcpy(dest, src, len);
#else
/* Copy from the beginning to the end. */
diff --git a/libc/string/generic/mempcpy.c b/libc/string/generic/mempcpy.c
index 4eb6db099..f2c860107 100644
--- a/libc/string/generic/mempcpy.c
+++ b/libc/string/generic/mempcpy.c
@@ -9,11 +9,10 @@
#undef mempcpy
-void attribute_hidden *__libc_mempcpy (void *dstpp, const void *srcpp, size_t len)
+void attribute_hidden *__mempcpy (void *dstpp, const void *srcpp, size_t len)
{
- memcpy(dstpp, srcpp, len);
+ __memcpy(dstpp, srcpp, len);
return (void *)(((char *)dstpp) + len);
}
-strong_alias(__libc_mempcpy, __mempcpy)
-strong_alias(__mempcpy, mempcpy)
+strong_alias(__mempcpy,mempcpy)
diff --git a/libc/string/generic/strcspn.c b/libc/string/generic/strcspn.c
index c41132cf6..a10912e25 100644
--- a/libc/string/generic/strcspn.c
+++ b/libc/string/generic/strcspn.c
@@ -27,7 +27,7 @@ size_t attribute_hidden __strcspn (const char *s, const char *reject)
size_t count = 0;
while (*s != '\0')
- if (strchr (reject, *s++) == NULL)
+ if (__strchr (reject, *s++) == NULL)
++count;
else
return count;
diff --git a/libc/string/generic/strrchr.c b/libc/string/generic/strrchr.c
index bde4d4da0..325be7d48 100644
--- a/libc/string/generic/strrchr.c
+++ b/libc/string/generic/strrchr.c
@@ -30,10 +30,10 @@ char attribute_hidden *__strrchr (const char *s, int c)
/* Since strchr is fast, we use it rather than the obvious loop. */
if (c == '\0')
- return strchr (s, '\0');
+ return __strchr (s, '\0');
found = NULL;
- while ((p = strchr (s, c)) != NULL)
+ while ((p = __strchr (s, c)) != NULL)
{
found = p;
s = p + 1;
diff --git a/libc/string/generic/strsep.c b/libc/string/generic/strsep.c
index b46610849..9515fa193 100644
--- a/libc/string/generic/strsep.c
+++ b/libc/string/generic/strsep.c
@@ -46,7 +46,7 @@ char attribute_hidden *__strsep (char **stringp, const char *delim)
else if (*begin == '\0')
end = NULL;
else
- end = strchr (begin + 1, ch);
+ end = __strchr (begin + 1, ch);
}
}
else