[git commit] fnmatch: replace __memset and __memcmp

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jun 15 12:00:28 UTC 2012


commit: http://git.uclibc.org/uClibc/commit/?id=a5173428bbf42060944d0a09d65fb8518ab2fa3a
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/misc/fnmatch/fnmatch.c      |   10 +++-------
 libc/misc/fnmatch/fnmatch_loop.c |    4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 2874413..413162f 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 af41727..9ef4ea3 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)
 					  {


More information about the uClibc-cvs mailing list