From patchwork Sun Jul 17 08:48:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 105007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E5C3B6F70 for ; Sun, 17 Jul 2011 18:51:23 +1000 (EST) Received: from localhost ([::1]:54211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QiN4G-0004LJ-UQ for incoming@patchwork.ozlabs.org; Sun, 17 Jul 2011 04:51:17 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QiN23-0004LA-O5 for qemu-devel@nongnu.org; Sun, 17 Jul 2011 04:49:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QiN22-0007TJ-Tj for qemu-devel@nongnu.org; Sun, 17 Jul 2011 04:48:59 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:48812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QiN22-0007TF-PM for qemu-devel@nongnu.org; Sun, 17 Jul 2011 04:48:58 -0400 Received: by qyk30 with SMTP id 30so1524945qyk.4 for ; Sun, 17 Jul 2011 01:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=gCWH1IGeAvWrt7jTZiGdMV++nS5fGN7sVosWql3cIRY=; b=G8NCo8jvWEhm19lW+Gf0jFtcIp118n+6/EzcG1MPw8EXaLjd0f+pgICghWhnGNflw8 qAXDzHcrbfEzKoSj/5dCUFe8Rhq2/vtQV4atte5WZD/jT0vH0+9lCmjafu/GsVyorqSs ubhiz8Bgwkmi4l24EqzU2CLQNUpNr2Ow1iYv4= Received: by 10.224.206.201 with SMTP id fv9mr4244217qab.370.1310892538143; Sun, 17 Jul 2011 01:48:58 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.74.13 with HTTP; Sun, 17 Jul 2011 01:48:38 -0700 (PDT) From: Blue Swirl Date: Sun, 17 Jul 2011 11:48:38 +0300 Message-ID: To: Jan Kiszka , qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.180 Subject: [Qemu-devel] [PATCH] checkpatch: Fix bracing false positives on #if X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 789f88d0b21fedfd4251d56bb7a9fbfbda7a4ac7 only fixed #else, fix also #if. Signed-off-by: Blue Swirl Reviewed-by: Stefan Hajnoczi --- scripts/checkpatch.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 075b614..9bc867f 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2537,6 +2537,7 @@ sub process { } if (!defined $suppress_ifbraces{$linenr - 1} && $line =~ /\b(if|while|for|else)\b/ && + $line !~ /\#\s*if/ && $line !~ /\#\s*else/) { my $allowed = 0;