Home » Mailing list archives » linux-kernel » 2008 » August » 11

[PATCH 15/17] checkpatch: report the correct lines for single statement blocks

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Andy Whitcroft
Subject: [PATCH 15/17] checkpatch: report the correct lines for single statement blocks
Date: Monday, August 11, 2008 - 1:13 pm

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>
---
 scripts/checkpatch.pl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c7980ff..36825c3 100755
--- a/scripts/checkpatch.pl
+++ b/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);
-- 
1.6.0.rc1.258.g80295

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/17] checkpatch: update to version 0.22, Andy Whitcroft, (Mon Aug 11, 1:12 pm)
[PATCH 01/17] checkpatch: square brackets -- exemption for ..., Andy Whitcroft, (Mon Aug 11, 1:12 pm)
[PATCH 02/17] checkpatch: values: double ampersand may be ..., Andy Whitcroft, (Mon Aug 11, 1:12 pm)
[PATCH 03/17] checkpatch: conditional indent -- labels hav ..., Andy Whitcroft, (Mon Aug 11, 1:12 pm)
[PATCH 04/17] checkpatch: switch indent allow plain return, Andy Whitcroft, (Mon Aug 11, 1:12 pm)
[PATCH 05/17] checkpatch: add tests for the attribute matcher, Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 06/17] checkpatch: ____cacheline_aligned et al are ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 07/17] checkpatch: complex macros -- fix up extensi ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 08/17] checkpatch: fix up comment checks search to ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 09/17] checkpatch: include/asm checks should be anc ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 10/17] checkpatch: reduce warnings for #include of ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 11/17] checkpatch: report any absolute references t ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 12/17] checkpatch: report the real first line of al ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 13/17] checkpatch: suspect indent -- skip over prep ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 14/17] checkpatch: %Lx tests should hand %% as a li ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 15/17] checkpatch: report the correct lines for sin ..., Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 16/17] checkpatch: perform indent checks on perl, Andy Whitcroft, (Mon Aug 11, 1:13 pm)
[PATCH 17/17] checkpatch: version: 0.22, Andy Whitcroft, (Mon Aug 11, 1:13 pm)
Re: [PATCH 09/17] checkpatch: include/asm checks should be ..., Geert Uytterhoeven, (Wed Oct 8, 6:39 am)