public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] string: Hook up the default implementation on test-strrchr
@ 2023-02-06 20:15 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-02-06 20:15 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b9d2d4a76508fdcbd9f421cdd98bf324c22af3c
commit 0b9d2d4a76508fdcbd9f421cdd98bf324c22af3c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Feb 2 13:57:20 2023 -0300
string: Hook up the default implementation on test-strrchr
And remove SIMPLE_STRRCHR, which is not used anywhere.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diff:
---
string/test-strrchr.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/string/test-strrchr.c b/string/test-strrchr.c
index 2cd5de42cd..c979574c92 100644
--- a/string/test-strrchr.c
+++ b/string/test-strrchr.c
@@ -26,14 +26,12 @@
#ifdef WIDE
# include <wchar.h>
-# define SIMPLE_STRRCHR simple_wcsrchr
# define STRRCHR wcsrchr
# define CHAR wchar_t
# define UCHAR wchar_t
# define BIG_CHAR WCHAR_MAX
# define SMALL_CHAR 1273
#else
-# define SIMPLE_STRRCHR simple_strrchr
# define STRRCHR strrchr
# define CHAR char
# define UCHAR unsigned char
@@ -45,18 +43,30 @@ typedef CHAR *(*proto_t) (const CHAR *, int);
IMPL (STRRCHR, 1)
-/* Naive implementation to verify results. */
-CHAR *
-SIMPLE_STRRCHR (const CHAR *s, int c)
-{
- const CHAR *ret = NULL;
-
- for (; *s != '\0'; ++s)
- if (*s == (CHAR) c)
- ret = s;
-
- return (CHAR *) (c == '\0' ? s : ret);
-}
+/* Also check the generic implementation. */
+#undef STRRCHR
+#undef weak_alias
+#define weak_alias(a, b)
+#undef libc_hidden_builtin_def
+#define libc_hidden_builtin_def(a)
+#undef libc_hidden_def
+#define libc_hidden_def(a)
+#undef libc_hidden_weak
+#define libc_hidden_weak(a)
+#ifndef WIDE
+# define STRLEN __strlen_default
+# include "string/strlen.c"
+# define MEMRCHR __memrchr_default
+# include "string/memrchr.c"
+# define STRRCHR __strrchr_default
+# include "string/strrchr.c"
+# define STRRCHR_DEFAULT __strrchr_default
+#else
+# define WCSRCHR __wcsrchr_default
+# include "wcsmbs/wcsrchr.c"
+# define STRRCHR_DEFAULT __wcsrchr_default
+#endif
+IMPL (STRRCHR_DEFAULT, 1)
static void
do_one_test (impl_t *impl, const CHAR *s, int c, CHAR *exp_res)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-06 20:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-06 20:15 [glibc] string: Hook up the default implementation on test-strrchr Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).