summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-19 01:11:10 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:28 +0200
commita5173428bbf42060944d0a09d65fb8518ab2fa3a (patch)
tree144b6c6a43ec27cbf74cd96697c3df4a516d57d1
parent3d1f9dff69738b7624ac5c1ca20febfcfce2c866 (diff)
fnmatch: replace __memset and __memcmp
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--libc/misc/fnmatch/fnmatch.c10
-rw-r--r--libc/misc/fnmatch/fnmatch_loop.c4
2 files changed, 5 insertions, 9 deletions
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 2874413ec..413162f86 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -54,10 +54,6 @@
# include <stdlib.h>
#endif
-#ifdef __UCLIBC__
-# define __memset memset
-#endif
-
/* For platform which support the ISO C amendement 1 functionality we
support user defined character classes. */
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
@@ -347,7 +343,7 @@ fnmatch (const char *pattern, const char *string, int flags)
wchar_t *wstring = NULL;
/* Convert the strings into wide characters. */
- __memset (&ps, '\0', sizeof (ps));
+ memset (&ps, '\0', sizeof (ps));
p = pattern;
#ifdef _LIBC
n = strnlen (pattern, 1024);
@@ -364,7 +360,7 @@ fnmatch (const char *pattern, const char *string, int flags)
already done? */
return -1;
if (p)
- __memset (&ps, '\0', sizeof (ps));
+ memset (&ps, '\0', sizeof (ps));
}
if (__builtin_expect (p != NULL, 0))
{
@@ -396,7 +392,7 @@ fnmatch (const char *pattern, const char *string, int flags)
already done? */
return -1;
if (p)
- __memset (&ps, '\0', sizeof (ps));
+ memset (&ps, '\0', sizeof (ps));
}
if (__builtin_expect (p != NULL, 0))
{
diff --git a/libc/misc/fnmatch/fnmatch_loop.c b/libc/misc/fnmatch/fnmatch_loop.c
index af41727c0..9ef4ea360 100644
--- a/libc/misc/fnmatch/fnmatch_loop.c
+++ b/libc/misc/fnmatch/fnmatch_loop.c
@@ -508,7 +508,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
if (symb_table[2 * elem] == hash
&& (c1
== extra[symb_table[2 * elem + 1]])
- && __memcmp (str,
+ && memcmp (str,
&extra[symb_table[2 * elem
+ 1]
+ 1], c1) == 0)
@@ -729,7 +729,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
if (symb_table[2 * elem] == hash
&& (c1
== extra[symb_table[2 * elem + 1]])
- && __memcmp (str,
+ && memcmp (str,
&extra[symb_table[2 * elem + 1]
+ 1], c1) == 0)
{