From patchwork Fri Mar 23 21:31:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 890244 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 407Gvx0Xxnz9s0p for ; Sat, 24 Mar 2018 08:32:13 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C784E1244; Fri, 23 Mar 2018 21:31:48 +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 CB445116F for ; Fri, 23 Mar 2018 21:31:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7B8FA5D9 for ; Fri, 23 Mar 2018 21:31:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2FD7818595A; Fri, 23 Mar 2018 21:31:44 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (ovpn-123-22.rdu2.redhat.com [10.10.123.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 843402026E0E; Fri, 23 Mar 2018 21:31:44 +0000 (UTC) From: Aaron Conole To: dev@openvswitch.org Date: Fri, 23 Mar 2018 17:31:40 -0400 Message-Id: <20180323213142.461-2-aconole@redhat.com> In-Reply-To: <20180323213142.461-1-aconole@redhat.com> References: <20180323213142.461-1-aconole@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 23 Mar 2018 21:31:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 23 Mar 2018 21:31:44 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'aconole@redhat.com' RCPT:'' X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/3] checkpatch: introduce constants for the parse states 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 It's just easier to read. Should be no functional change. Signed-off-by: Aaron Conole --- utilities/checkpatch.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py index 8a3895240..2bc34db62 100755 --- a/utilities/checkpatch.py +++ b/utilities/checkpatch.py @@ -370,6 +370,11 @@ def run_checks(current_file, line, lineno): def ovs_checkpatch_parse(text, filename): global print_file_name, total_line, checking_file + + PARSE_STATE_HEADING = 0 + PARSE_STATE_DIFF_HEADER = 1 + PARSE_STATE_CHANGE_BODY = 2 + lineno = 0 signatures = [] co_authors = [] @@ -399,18 +404,18 @@ def ovs_checkpatch_parse(text, filename): continue if checking_file: - parse = 2 + parse = PARSE_STATE_CHANGE_BODY - if parse == 1: + if parse == PARSE_STATE_DIFF_HEADER: match = hunks.match(line) if match: - parse = parse + 1 + parse = PARSE_STATE_CHANGE_BODY current_file = match.group(2)[2:] print_file_name = current_file continue - elif parse == 0: + elif parse == PARSE_STATE_HEADING: if scissors.match(line): - parse = parse + 1 + parse = PARSE_STATE_DIFF_HEADER if not skip_signoff_check: if len(signatures) == 0: print_error("No signatures found.") @@ -429,7 +434,7 @@ def ovs_checkpatch_parse(text, filename): print_error( "Remove Gerrit Change-Id's before submitting upstream.") print("%d: %s\n" % (lineno, line)) - elif parse == 2: + elif parse == PARSE_STATE_CHANGE_BODY: newfile = hunks.match(line) if newfile: current_file = newfile.group(2)[2:]