aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2008-10-16 01:02:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:35 -0400
commitf055663c5853aa1d9f4c86351a4637462a0b9041 (patch)
treeff000717ccecc62cea6832852f2e3e229007489b
parent2a1bc5d5c5096f2dfb6f8b18f39ecb718f101535 (diff)
checkpatch: report the correct lines for single statement blocks
Report the correct lines for single statement blocks. Currently we are reporting the right number of lines, but not skipping the negative lines. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/checkpatch.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c7980ff2975e..36825c3d7d79 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2214,10 +2214,10 @@ sub process {
2214 } 2214 }
2215 if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) { 2215 if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
2216 my $herectx = $here . "\n";; 2216 my $herectx = $here . "\n";;
2217 my $end = $linenr + statement_rawlines($block) - 1; 2217 my $cnt = statement_rawlines($block);
2218 2218
2219 for (my $ln = $linenr - 1; $ln < $end; $ln++) { 2219 for (my $n = 0; $n < $cnt; $n++) {
2220 $herectx .= $rawlines[$ln] . "\n";; 2220 $herectx .= raw_line($linenr, $n) . "\n";;
2221 } 2221 }
2222 2222
2223 WARN("braces {} are not necessary for single statement blocks\n" . $herectx); 2223 WARN("braces {} are not necessary for single statement blocks\n" . $herectx);