From patchwork Sun Nov 9 21:53:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 123856 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BE13B3858D33 for ; Sun, 9 Nov 2025 22:12:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE13B3858D33 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=VHxKb3CU X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by sourceware.org (Postfix) with ESMTPS id 5EAD83858C56 for ; Sun, 9 Nov 2025 21:53:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5EAD83858C56 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5EAD83858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762725207; cv=none; b=KnFEfgL8lILGN3jHQxqOINkCyeqf5+y04yDUF8L9jDd+sz4lHtqVidNGhvjadfsjenU8IlrpySt8YU7PFcGRKme9Y1Oitjmh0FDd2pOiQgFm8jhzfEBBth5Dh8Cl1m8/13xXLBZ0c7VYgDgG/iq2y5VyqTOVOK3ApyfbBOsA6s8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762725207; c=relaxed/simple; bh=2gfOTCeT8bou58k4dTdax2rrnxZSJQhHHD216U2Advg=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=eyFyIMUsNCp5uVt5jzRN7Z67redJooPmLvnTFH9Za1x6u6R5whdpOPfJJiO3VNwSE9STK5o8x6YoSi2drcPZIWNwQwIkbbgXpnMvYOFoWHLcHexMwjuxF5XE9eEYlW7ASobC8TvUYqXOlCsiiMbxw6WsmEGz1LvxtnsBlgm5uW0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EAD83858C56 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id C98004369A for ; Sun, 9 Nov 2025 21:53:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07BE3C4CEFB; Sun, 9 Nov 2025 21:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762725206; bh=2gfOTCeT8bou58k4dTdax2rrnxZSJQhHHD216U2Advg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VHxKb3CUQkjjKhfFRLaOy7zxe3TVpn4Sm4WkihMEouCtCVKumL4+bZPoOJ4EvGgNS LjsihSrXomoVWLEuQ9GmV0t7JPD2Y5jEJ3QW24vzfqpD2lGOyPjkM2r2lTPX+BLVhX xskdSSXB4z91xDimFEmbinAqCP+rt40LJMn1tYJUyVrlFUhURrSx1mbvBNslUEqQHl hco4FfJXXynvi2Vle4n9gjG4exUX3elIdIwegPTCF3C1cKQihzmmonptsjFCOQylAX vjz4stj+GkhN/pgXd5lC8NlczhsleuBZN9Yso6XhueJrfLrQPFUGR3IyhCyJZS8Q6f YA+M/ZPhXVP5A== Date: Sun, 9 Nov 2025 22:53:24 +0100 From: Alejandro Colomar To: libc-alpha@sourceware.org Cc: Alejandro Colomar Subject: [PATCH v1 15/35] posix/regex.h: Use __restrict_arr and remove _Restrict_arr_ Message-ID: <4e5a815e49270ed873481344fca9e949d57eac40.1762725057.git.alx@kernel.org> X-Mailer: git-send-email 2.51.0 References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Signed-off-by: Alejandro Colomar --- posix/regex.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/posix/regex.h b/posix/regex.h index bd1d941f38..f33368562a 100644 --- a/posix/regex.h +++ b/posix/regex.h @@ -638,18 +638,12 @@ extern int re_exec (const char *); /* For the ISO C99 syntax array_name[restrict] - use glibc's __restrict_arr if available. - Otherwise, GCC 3.1 and clang support this syntax (but not in C++ mode). - Other ISO C99 compilers support it as well. */ -#ifndef _Restrict_arr_ -# ifdef __restrict_arr -# define _Restrict_arr_ __restrict_arr + use glibc's __restrict_arr if available. */ +#ifndef __restrict_arr +# if defined __cplusplus +# define __restrict_arr # else -# if !defined __cplusplus -# define _Restrict_arr_ __restrict -# else -# define _Restrict_arr_ -# endif +# define __restrict_arr __restrict # endif #endif @@ -660,7 +654,7 @@ extern int regcomp (regex_t *__restrict __preg, extern int regexec (const regex_t *__restrict __preg, const char *__restrict __String, size_t __nmatch, - regmatch_t __pmatch[_Restrict_arr_ + regmatch_t __pmatch[__restrict_arr _REGEX_NELTS (__nmatch)], int __eflags);