lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

string: Hook up the default implementation on test-memchr

Browse Source 
And remove SIMPLE_MEMCHR, which is not used anywhere.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Adhemerval Zanella
2023-01-17 10:14:03 -03:00
parent 3092c84900
commit 0dfa8617b5
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
string/test-memchr.c
View File

@ -30,7 +30,6 @@
# define MEMCHR memchr # define MEMCHR memchr
# define CHAR char # define CHAR char
# define UCHAR unsigned char # define UCHAR unsigned char
# define SIMPLE_MEMCHR simple_memchr
# define BIG_CHAR CHAR_MAX # define BIG_CHAR CHAR_MAX
# define SMALL_CHAR 127 # define SMALL_CHAR 127
#else #else
@ -38,7 +37,6 @@
# define MEMCHR wmemchr # define MEMCHR wmemchr
# define CHAR wchar_t # define CHAR wchar_t
# define UCHAR wchar_t # define UCHAR wchar_t
# define SIMPLE_MEMCHR simple_wmemchr
# define BIG_CHAR WCHAR_MAX # define BIG_CHAR WCHAR_MAX
# define SMALL_CHAR 1273 # define SMALL_CHAR 1273
#endif /* WIDE */ #endif /* WIDE */
@ -47,15 +45,26 @@ typedef CHAR *(*proto_t) (const CHAR *, int, size_t);
IMPL (MEMCHR, 1) IMPL (MEMCHR, 1)
/* Naive implementation to verify results. */ /* Also check the generic implementation. */
CHAR * #undef MEMCHR
SIMPLE_MEMCHR (const CHAR *s, int c, size_t n) #undef weak_alias
{ #define weak_alias(a, b)
while (n--) #undef libc_hidden_builtin_def
if (*s++ == (CHAR) c) #define libc_hidden_builtin_def(a)
return (CHAR *) s - 1; #undef libc_hidden_def
return NULL; #define libc_hidden_def(a)
} #undef libc_hidden_weak
#define libc_hidden_weak(a)
#ifndef WIDE
# define MEMCHR __memchr_default
# include "string/memchr.c"
# define MEMCHR_DEFAULT MEMCHR
#else
# define WMEMCHR __wmemchr_default
# include "wcsmbs/wmemchr.c"
# define MEMCHR_DEFAULT WMEMCHR
#endif
IMPL (MEMCHR_DEFAULT, 1)
static void static void
do_one_test (impl_t *impl, const CHAR *s, int c, size_t n, CHAR *exp_res) do_one_test (impl_t *impl, const CHAR *s, int c, size_t n, CHAR *exp_res)