From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 1138B3858D35; Mon, 6 Feb 2023 20:14:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1138B3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675714493; bh=1csIHPqEaKYT5R3s5qJtIIUaecS7nhH06tk1H1uR5Q4=; h=From:To:Subject:Date:From; b=smuqol9Xr4TueZiN+upqhhtX7S2FNx8uZ5y1TtkChB3xrrh45oSJOIyZmBzpVYhCz t4q8Etzi7ohSkiWTJW5yIxsVx385h2KDrpRuCeJLckHPNTNi4sT90m68ng+BceRtbc bORA1iD/YFoyGYJ9/cvCFZUk3dVqCyXAPWgX5vDY= 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-strlen X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 25788431c0f5264c4830415de0cdd4d9926cbad9 X-Git-Newrev: 52d9adc9e33819323eb971712c136bd618cdea1d Message-Id: <20230206201453.1138B3858D35@sourceware.org> Date: Mon, 6 Feb 2023 20:14:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=52d9adc9e33819323eb971712c136bd618cdea1d commit 52d9adc9e33819323eb971712c136bd618cdea1d Author: Adhemerval Zanella Date: Tue Jan 17 10:10:21 2023 -0300 string: Hook up the default implementation on test-strlen Also remove the simple_STRLEN and builtin_strlen, which are not used anywhere. Reviewed-by: Richard Henderson Diff: --- string/test-strlen.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/string/test-strlen.c b/string/test-strlen.c index 81adf23737..0f98576f40 100644 --- a/string/test-strlen.c +++ b/string/test-strlen.c @@ -37,27 +37,24 @@ typedef size_t (*proto_t) (const CHAR *); -/* Naive implementation to verify results. */ -size_t -simple_STRLEN (const CHAR *s) -{ - const CHAR *p; - - for (p = s; *p; ++p); - return p - s; -} +IMPL (STRLEN, 1) +/* Also check the generic implementation. */ +#undef STRLEN +#undef weak_alias +#define weak_alias(a, b) +#undef libc_hidden_builtin_def +#define libc_hidden_builtin_def(a) #ifndef WIDE -size_t -builtin_strlen (const CHAR *p) -{ - return __builtin_strlen (p); -} -IMPL (builtin_strlen, 0) +# define STRLEN __strlen_default +# include "string/strlen.c" +IMPL (__strlen_default, 1) +#else +# define WCSLEN __wcslen_default +# include "wcsmbs/wcslen.c" +IMPL (__wcslen_default, 1) #endif -IMPL (STRLEN, 1) - static void do_one_test (impl_t *impl, const CHAR *s, size_t exp_len)