From patchwork Wed Aug 9 20:37:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 799943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xSNQV05mBz9s82 for ; Thu, 10 Aug 2017 06:38:42 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 781BDC98; Wed, 9 Aug 2017 20:38:05 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 19F1EC48 for ; Wed, 9 Aug 2017 20:38:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E1D821F2 for ; Wed, 9 Aug 2017 20:38:01 +0000 (UTC) X-Originating-IP: 208.91.1.34 Received: from carno.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 29731A80C6 for ; Wed, 9 Aug 2017 22:37:59 +0200 (CEST) From: Joe Stringer To: dev@openvswitch.org Date: Wed, 9 Aug 2017 13:37:51 -0700 Message-Id: <20170809203752.16886-2-joe@ovn.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170809203752.16886-1-joe@ovn.org> References: <20170809203752.16886-1-joe@ovn.org> Subject: [ovs-dev] [PATCH 2/3] checkpatch: Fix matching on C filenames. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Most of the prerequisite checks so far matched on filenames that ended in some character followed by 'c' or 'h', rather than a filename that ends in '.c' or '.h'. Fix this. Signed-off-by: Joe Stringer Acked-by: Ben Pfaff --- utilities/checkpatch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py index 8b9ca0f504d3..1bb256ccd4d6 100755 --- a/utilities/checkpatch.py +++ b/utilities/checkpatch.py @@ -223,17 +223,17 @@ checks = [ 'check': lambda x: trailing_whitespace_or_crlf(x), 'print': lambda: print_warning("Line has trailing whitespace")}, - {'regex': '(.c|.h)(.in)?$', 'match_name': None, + {'regex': '(\.c|\.h)(\.in)?$', 'match_name': None, 'prereq': lambda x: not is_comment_line(x), 'check': lambda x: not if_and_for_whitespace_checks(x), 'print': lambda: print_error("Improper whitespace around control block")}, - {'regex': '(.c|.h)(.in)?$', 'match_name': None, + {'regex': '(\.c|\.h)(\.in)?$', 'match_name': None, 'prereq': lambda x: not is_comment_line(x), 'check': lambda x: not if_and_for_end_with_bracket_check(x), 'print': lambda: print_error("Inappropriate bracing around statement")}, - {'regex': '(.c|.h)(.in)?$', 'match_name': None, + {'regex': '(\.c|\.h)(\.in)?$', 'match_name': None, 'prereq': lambda x: not is_comment_line(x), 'check': lambda x: pointer_whitespace_check(x), 'print': @@ -267,7 +267,7 @@ std_functions = [ ('error', 'Use ovs_error() in place of error()'), ] checks += [ - {'regex': '(.c|.h)(.in)?$', + {'regex': '(\.c|\.h)(\.in)?$', 'match_name': None, 'prereq': lambda x: not is_comment_line(x), 'check': regex_function_factory(function_name),