From nobody Thu Feb 12 03:38:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72EBFEE0211 for ; Wed, 13 Sep 2023 20:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232654AbjIMUiH (ORCPT ); Wed, 13 Sep 2023 16:38:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232632AbjIMUiF (ORCPT ); Wed, 13 Sep 2023 16:38:05 -0400 Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A63261BC6 for ; Wed, 13 Sep 2023 13:38:01 -0700 (PDT) Received: from omf16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7DDED1A0DB3; Wed, 13 Sep 2023 20:38:00 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: joe@perches.com) by omf16.hostedemail.com (Postfix) with ESMTPA id 668C42000E; Wed, 13 Sep 2023 20:37:58 +0000 (UTC) From: Joe Perches To: Andrew Morton , Andy Whitcroft , Dwaipayan Ray , Lukas Bulwahn Cc: Gustavo Silva , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] checkpatch: Simplify creating search strings Date: Wed, 13 Sep 2023 13:37:51 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 668C42000E X-Rspamd-Server: rspamout06 X-Stat-Signature: aig5jh5ba1bsssmfixgizfssewqsei5t X-Session-Marker: 6A6F6540706572636865732E636F6D X-Session-ID: U2FsdGVkX19uOctU2Ce8H1bSgmQLe4M/7y7V0x72Py4= X-HE-Tag: 1694637478-717840 X-HE-Meta: U2FsdGVkX1+8zdzFunbnL6OYE3TD/jnVW9qkuNeJy91kNora1rdp3TEvaPjQlUttQeEqUdrxLr2S5VEbtnwHGv7ozUcuQNZhBm2bXCOm+8vBY3V0ue70BrLDe5p0M5+av18oI319qtPXeVYgsC8nlHDms8wxEFDn5d0kfiYX56S/etsyCk1zRysKMp666vY9K36+SeHfNUbMKTLqI2Kqz943GVsHaXfSn/mn4X9fb7Wxhchf1eKD7oDoxsQ1Mih29BMkN8YGZGbQ/b1dNq6P0IGnrE5FEujbOdDLNgH4fq2dCpEW4fpPz9x3I67/zJkNJQfta3rcCqs= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use join and map instead of loops. Signed-off-by: Joe Perches --- scripts/checkpatch.pl | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 7d16f863edf1c..617f9e53bacdf 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -625,18 +625,8 @@ our $signature_tags =3D qr{(?xi: our @link_tags =3D qw(Link Closes); =20 #Create a search and print patterns for all these strings to be used direc= tly below -our $link_tags_search =3D ""; -our $link_tags_print =3D ""; -foreach my $entry (@link_tags) { - if ($link_tags_search ne "") { - $link_tags_search .=3D '|'; - $link_tags_print .=3D ' or '; - } - $entry .=3D ':'; - $link_tags_search .=3D $entry; - $link_tags_print .=3D "'$entry'"; -} -$link_tags_search =3D "(?:${link_tags_search})"; +our $link_tags_search =3D '(?:' . join('|', @link_tags) . ')'; +our $link_tags_print =3D "'" . join("' or '", @link_tags) . "'"; =20 our $tracing_logging_tags =3D qr{(?xi: [=3D-]*> | @@ -819,15 +809,10 @@ our @mode_permission_funcs =3D ( ["__ATTR", 2], ); =20 -my $word_pattern =3D '\b[A-Z]?[a-z]{2,}\b'; - #Create a search pattern for all these functions to speed up a loop below -our $mode_perms_search =3D ""; -foreach my $entry (@mode_permission_funcs) { - $mode_perms_search .=3D '|' if ($mode_perms_search ne ""); - $mode_perms_search .=3D $entry->[0]; -} -$mode_perms_search =3D "(?:${mode_perms_search})"; +our $mode_perms_search =3D '(?:' . join('|', map{$_->[0]} @mode_permission= _funcs) . ')'; + +my $word_pattern =3D '\b[A-Z]?[a-z]{2,}\b'; =20 our %deprecated_apis =3D ( "synchronize_rcu_bh" =3D> "synchronize_rcu", @@ -847,12 +832,7 @@ our %deprecated_apis =3D ( ); =20 #Create a search pattern for all these strings to speed up a loop below -our $deprecated_apis_search =3D ""; -foreach my $entry (keys %deprecated_apis) { - $deprecated_apis_search .=3D '|' if ($deprecated_apis_search ne ""); - $deprecated_apis_search .=3D $entry; -} -$deprecated_apis_search =3D "(?:${deprecated_apis_search})"; +our $deprecated_apis_search =3D '(?:' . join('|', keys %deprecated_apis) .= ')'; =20 our $mode_perms_world_writable =3D qr{ S_IWUGO | @@ -887,7 +867,7 @@ foreach my $entry (keys %mode_permission_string_types) { $mode_perms_string_search .=3D '|' if ($mode_perms_string_search ne ""); $mode_perms_string_search .=3D $entry; } -our $single_mode_perms_string_search =3D "(?:${mode_perms_string_search})"; +our $single_mode_perms_string_search =3D '(?:' . join('|', keys %mode_perm= ission_string_types) . ')'; our $multi_mode_perms_string_search =3D qr{ ${single_mode_perms_string_search} (?:\s*\|\s*${single_mode_perms_string_search})* --=20 2.41.0