From 6b1c67dfbdafbf9eaf46b38971e0c107c1bc3e44 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 15 Oct 2008 22:02:23 -0700 Subject: [PATCH] --- yaml --- r: 114763 b: refs/heads/master c: f055663c5853aa1d9f4c86351a4637462a0b9041 h: refs/heads/master i: 114761: ad7909d671a03b9c951ef592a7c67df77909f2e8 114759: 959402cef8e16f371430119ee7b8175135274d06 v: v3 --- [refs] | 2 +- trunk/scripts/checkpatch.pl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index da29a96b7e1e..4506171ff96f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a1bc5d5c5096f2dfb6f8b18f39ecb718f101535 +refs/heads/master: f055663c5853aa1d9f4c86351a4637462a0b9041 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index c7980ff2975e..36825c3d7d79 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -2214,10 +2214,10 @@ sub process { } if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) { my $herectx = $here . "\n";; - my $end = $linenr + statement_rawlines($block) - 1; + my $cnt = statement_rawlines($block); - for (my $ln = $linenr - 1; $ln < $end; $ln++) { - $herectx .= $rawlines[$ln] . "\n";; + for (my $n = 0; $n < $cnt; $n++) { + $herectx .= raw_line($linenr, $n) . "\n";; } WARN("braces {} are not necessary for single statement blocks\n" . $herectx);