From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2A3AA3858C54; Mon, 6 Feb 2023 20:14:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A3AA3858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675714498; bh=ep4GZuts/D0CBxQCZneg8jbHxlW56D9bgJO/2WYgNV0=; h=From:To:Subject:Date:From; b=J4AO9QirnpKDhA0HbHinkgSesTzs5iBF60Qzwqkw+zqfq0iv+I/EzTYJjMTcnHGMJ JmZkkUINfKOp+jm7kf4P5FZ+/QFrnAO9GmcvM97g1U25DAlmtHoh2aqL6YuPfzQvcb EAVXCbZRQaKTAcjkQ91fRsK+pRhTn8KrtpuOqRjI= 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-strnlen X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 52d9adc9e33819323eb971712c136bd618cdea1d X-Git-Newrev: b79cffb39185301d50dc42db2dfaf1d971be12c3 Message-Id: <20230206201458.2A3AA3858C54@sourceware.org> Date: Mon, 6 Feb 2023 20:14:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b79cffb39185301d50dc42db2dfaf1d971be12c3 commit b79cffb39185301d50dc42db2dfaf1d971be12c3 Author: Adhemerval Zanella Date: Tue Jan 17 10:11:36 2023 -0300 string: Hook up the default implementation on test-strnlen Also remove the SIMPLE_STRNLEN, which is not used anywhere. Reviewed-by: Richard Henderson Diff: --- string/test-strnlen.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/string/test-strnlen.c b/string/test-strnlen.c index 8b5372c3a1..ef73dd34f4 100644 --- a/string/test-strnlen.c +++ b/string/test-strnlen.c @@ -43,17 +43,30 @@ typedef size_t (*proto_t) (const CHAR *, size_t); -IMPL (STRNLEN, 1) - -/* Naive implementation to verify results. */ -size_t -SIMPLE_STRNLEN (const CHAR *s, size_t maxlen) -{ - size_t i; - - for (i = 0; i < maxlen && s[i]; ++i); - return i; -} +/* Also check the default implementation. */ +#undef STRNLEN +#ifndef WIDE +# define MEMCHR __memchr_default +# define weak_alias(a, b) +# define libc_hidden_def(a) +# define libc_hidden_builtin_def(a) +# include "string/memchr.c" +# undef STRNLEN +# define STRNLEN __strnlen_default +# define memchr __memchr_default +# include "string/strnlen.c" +IMPL (__strnlen_default, 1) +#else +# define WMEMCHR __wmemchr_default +# define weak_alias(a, b) +# define libc_hidden_def(a) +# define libc_hidden_weak(a) +# include "wcsmbs/wmemchr.c" +# define WCSNLEN __wcsnlen_default +# define wmemchr __wmemchr_default +# include "wcsmbs/wcsnlen.c" +IMPL (__wcsnlen_default, 1) +#endif static void do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len)