From patchwork Thu Mar 15 11:45:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Hang X-Patchwork-Id: 10284297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4575760291 for ; Thu, 15 Mar 2018 11:46:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FA2928673 for ; Thu, 15 Mar 2018 11:46:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22DC22899E; Thu, 15 Mar 2018 11:46:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E939228673 for ; Thu, 15 Mar 2018 11:46:16 +0000 (UTC) Received: from localhost ([::1]:50778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewRKq-0001dY-3u for patchwork-qemu-devel@patchwork.kernel.org; Thu, 15 Mar 2018 07:46:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewRK7-0001I0-5B for qemu-devel@nongnu.org; Thu, 15 Mar 2018 07:45:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewRK2-0006sr-4O for qemu-devel@nongnu.org; Thu, 15 Mar 2018 07:45:31 -0400 Received: from smtp17.cstnet.cn ([159.226.251.17]:58174 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewRK0-0006pK-Re for qemu-devel@nongnu.org; Thu, 15 Mar 2018 07:45:26 -0400 Received: from Sword.lan (unknown [124.16.136.100]) by APP-09 (Coremail) with SMTP id swCowAAXHi7MXKpa08MjEA--.3097S3; Thu, 15 Mar 2018 19:45:16 +0800 (CST) From: Su Hang To: eblake@redhat.com, vsementsov@virtuozzo.com Date: Thu, 15 Mar 2018 19:45:16 +0800 Message-Id: <1521114316-19980-1-git-send-email-suhang16@mails.ucas.ac.cn> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: swCowAAXHi7MXKpa08MjEA--.3097S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr17uF45tF1DWFykurWUCFg_yoW8Zw1fpF 4UGw1rurWYgF9xta9Iyw18JF45u3yvyrZ7Gry3XFyFvF98tFn5Jr9ayr1rtFyUXrsxua97 Xa10q3y3uF12va7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvab7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I 8E87Iv6xkF7I0E14v26F4UJVW0owAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x0 82IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGw Av7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48J MxkIecxEwVAFwVW8KwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s 026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_ Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20x vEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280 aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyT uYvjxUIVc_DUUUU X-CM-SenderInfo: pvxkt0rjrwqzpdlo2hpxfd2hldfou0/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 159.226.251.17 Subject: [Qemu-devel] [PATCH RFC] scripts/checkpatch.pl: Bug fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Bug fix: checkpatch.pl stops complaining about following pattern: """ do { //do somethins; } while (conditions); """ Two things need to be mentioned: 1) Before I casue this bug, checkpatch.pl will raise a wrong complain: """ ERROR: braces {} are necessary even for single statement blocks + for (i == 0; i < 0; ++i) + { + ; + } else """ In this patch, this wrong complain get fixed. 2) Becasue all(`if`, `while`, `for`) check have been done in this `if` block(Line: 2356), and this block contains following statement: """ Line: 2379 $suppress_ifbraces{$ln + $offset} = 1; """ So the block after this block may never run: """ Line: 2415 if (!defined $suppress_ifbraces{$linenr - 1} && $line =~ /\b(if|while|for|else)\b/ && $line !~ /\#\s*if/ && $line !~ /\#\s*else/) { """ But I think, maybe it's ok, becasue all check has been done by up block. I'm not sure, please give me some advice. Signed-off-by: Su Hang --- scripts/checkpatch.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d1fe79bcc47c..2ca833f22e5a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2355,6 +2355,18 @@ sub process { # check for missing bracing around if etc if ($line =~ /(^.*)\b(?:if|while|for)\b/ && $line !~ /\#\s*if/) { + my $allowed = 0; + + # Check the pre-context. + if ($line =~ /(\}.*?)$/) { + my $pre = $1; + + if ($line !~ /else/) { + print "APW: ALLOWED: pre<$pre> line<$line>\n" + if $dbg_adv_apw; + $allowed = 1; + } + } my ($level, $endln, @chunks) = ctx_statement_full($linenr, $realcnt, 1); if ($dbg_adv_apw) { @@ -2363,7 +2375,6 @@ sub process { if $#chunks >= 1; } if ($#chunks >= 0 && $level == 0) { - my $allowed = 0; my $seen = 0; my $herectx = $here . "\n"; my $ln = $linenr - 1; @@ -2407,7 +2418,7 @@ sub process { $allowed = 1; } } - if ($seen != ($#chunks + 1)) { + if ($seen != ($#chunks + 1) && !$allowed) { ERROR("braces {} are necessary for all arms of this statement\n" . $herectx); } }