From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 1C1B3385840C; Mon, 6 Feb 2023 20:15:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C1B3385840C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675714539; bh=eU5KJSdx4mxqg3E4KM5cyjbAsfRXjJML0rB0A1XvmE4=; h=From:To:Subject:Date:From; b=U3Ji36XUkPpoLUT2lbPgHHANWkII7NZe16+H0kj9ZqE/5WKWgmBjj7+1+mJe4+oPG wEjyWAFaFBBnZAKQOCrrgYkRAEtv3RSK/OJgQJJSaCkIoewMQKXkN4KezFq3b45fdX vSViSMacvegqGnRW8jeswLRw4w9XafJ0mxKAM6AY= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] string: Hook up the default implementation on test-strrchr X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 77a9e5c97eddec0db76b288c90c5ee2e4fe65ba5 X-Git-Newrev: 0b9d2d4a76508fdcbd9f421cdd98bf324c22af3c Message-Id: <20230206201539.1C1B3385840C@sourceware.org> Date: Mon, 6 Feb 2023 20:15:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b9d2d4a76508fdcbd9f421cdd98bf324c22af3c commit 0b9d2d4a76508fdcbd9f421cdd98bf324c22af3c Author: Adhemerval Zanella 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 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 -# 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)