From patchwork Wed Sep 13 20:37:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 139078 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp73761vqb; Wed, 13 Sep 2023 13:38:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9pYnjwzUXA3SVYHEwmOeYuq4PtN5lofeFjA63Uyh3thYkMnib4QDdYh607NIoQAb2VMxz X-Received: by 2002:a05:6808:13c4:b0:3a7:612:f62b with SMTP id d4-20020a05680813c400b003a70612f62bmr4647432oiw.25.1694637524219; Wed, 13 Sep 2023 13:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694637524; cv=none; d=google.com; s=arc-20160816; b=k8zzzfw2tgL7WAsGI3deHU7rjxWlMGdyZFAkJmx8uSRulBqkEaDhaAregL7EzS529p me2ON8H+KKKj5jfvHcx4mhMoUWPxHbhq+DsfQMEEtY97GspXJddR3+kM1pVymEBW88bs iTLQZalrJfLz9LA36+lKXoFv88HtBrjv7nzozle+KcbtB0iESb8QTAfr34OvD+O5nssi eh8Oo9okvnlGDiiOmqTzd5lNaRjD8mFVp+yqv1I/K0T7CXiR9tGLTD1ZyTY3ike+sck2 yAnuG3SHvZIM9nfYSNcXr6h5kUxeATxSYFDLtt5Le+QnBBiiva/bMS5gWsM0JcojUJz1 iU/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=D1CJBZuoJj77/RbAU2/BdZcGxvgcLBIatwCeRVHeQIk=; fh=bqPn+niz5aQZsD6V/8OOajUf9N3p5m0PF4Bpg+1BhpQ=; b=GpBq9xPpiDIR6enITHcdJJwZtE0pGJM3VhreOHgC2Sj5sxNxX62E++gQb9hzgFlayl ZoHEESHgtWtEiMeUcC8gBCOCodRMbwAlaaaOEz99OcugDw7dQkJl5D7K6CYYC0sK7UYr b32+rbjkNJb4kCkEdjAdoBJcRwe4nQCxxkrrHeszpiRKKh6AfNJZAyrCaU1keIon+j+r Tfbj7NnDK1bql1jkdQucI1zl8Nf2KlxPqfwgyu4v4PvoeOj3b7D+BR9NeOB56LA9LJTX YeVzqOYlMMBmnaCn6Apce9k6vPIg11zn/Lw50z6sdtKEUBbfL+uqBSoCfvOF6rGqVfAb 5PFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id s9-20020a656909000000b00573faa3bb3csi10863881pgq.307.2023.09.13.13.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 13:38:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 81C3D80BC517; Wed, 13 Sep 2023 13:38:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232611AbjIMUiH (ORCPT + 34 others); 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 X-Rspamd-Queue-Id: 668C42000E X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 13:38:19 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776956236851915087 X-GMAIL-MSGID: 1776956236851915087 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 = qr{(?xi: our @link_tags = qw(Link Closes); #Create a search and print patterns for all these strings to be used directly below -our $link_tags_search = ""; -our $link_tags_print = ""; -foreach my $entry (@link_tags) { - if ($link_tags_search ne "") { - $link_tags_search .= '|'; - $link_tags_print .= ' or '; - } - $entry .= ':'; - $link_tags_search .= $entry; - $link_tags_print .= "'$entry'"; -} -$link_tags_search = "(?:${link_tags_search})"; +our $link_tags_search = '(?:' . join('|', @link_tags) . ')'; +our $link_tags_print = "'" . join("' or '", @link_tags) . "'"; our $tracing_logging_tags = qr{(?xi: [=-]*> | @@ -819,15 +809,10 @@ our @mode_permission_funcs = ( ["__ATTR", 2], ); -my $word_pattern = '\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 = ""; -foreach my $entry (@mode_permission_funcs) { - $mode_perms_search .= '|' if ($mode_perms_search ne ""); - $mode_perms_search .= $entry->[0]; -} -$mode_perms_search = "(?:${mode_perms_search})"; +our $mode_perms_search = '(?:' . join('|', map{$_->[0]} @mode_permission_funcs) . ')'; + +my $word_pattern = '\b[A-Z]?[a-z]{2,}\b'; our %deprecated_apis = ( "synchronize_rcu_bh" => "synchronize_rcu", @@ -847,12 +832,7 @@ our %deprecated_apis = ( ); #Create a search pattern for all these strings to speed up a loop below -our $deprecated_apis_search = ""; -foreach my $entry (keys %deprecated_apis) { - $deprecated_apis_search .= '|' if ($deprecated_apis_search ne ""); - $deprecated_apis_search .= $entry; -} -$deprecated_apis_search = "(?:${deprecated_apis_search})"; +our $deprecated_apis_search = '(?:' . join('|', keys %deprecated_apis) . ')'; our $mode_perms_world_writable = qr{ S_IWUGO | @@ -887,7 +867,7 @@ foreach my $entry (keys %mode_permission_string_types) { $mode_perms_string_search .= '|' if ($mode_perms_string_search ne ""); $mode_perms_string_search .= $entry; } -our $single_mode_perms_string_search = "(?:${mode_perms_string_search})"; +our $single_mode_perms_string_search = '(?:' . join('|', keys %mode_permission_string_types) . ')'; our $multi_mode_perms_string_search = qr{ ${single_mode_perms_string_search} (?:\s*\|\s*${single_mode_perms_string_search})*