From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=55262 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PgKeO-0006b8-8V
	for qemu-devel@nongnu.org; Fri, 21 Jan 2011 12:19:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1PgKeI-0003Gw-FT
	for qemu-devel@nongnu.org; Fri, 21 Jan 2011 12:19:47 -0500
Received: from david.siemens.de ([192.35.17.14]:19126)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1PgKeI-0003G8-6M
	for qemu-devel@nongnu.org; Fri, 21 Jan 2011 12:19:46 -0500
Message-ID: <4D39C02C.80805@siemens.com>
Date: Fri, 21 Jan 2011 18:19:40 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] checkpatch: Fix bracing false positives on
	#else
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 scripts/checkpatch.pl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 55ef439..4fa06c0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2536,7 +2536,8 @@ sub process {
 			}
 		}
 		if (!defined $suppress_ifbraces{$linenr - 1} &&
-					$line =~ /\b(if|while|for|else)\b/) {
+					$line =~ /\b(if|while|for|else)\b/ &&
+					$line !~ /\#\s*else/) {
 			my $allowed = 0;
 
 			# Check the pre-context.
-- 
1.7.1