[PATCH] checkpatch: Fix stepping through statements with $stat and ctx_statement_block

From: Joe Perches
Date: Wed Jun 07 2017 - 15:15:47 EST


Fix the off-by-one in the suppression of lines in a statement block.

This means that for multiple line statements like

foo(bar,
baz,
qux);

$stat has been inspected first correctly for the entire statement,
and subsequently incorrectly just for

qux);

This fix will help make tracking appropriate indentation a little easier.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 7fcaf5ca997b..05c819093cc0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3219,7 +3219,7 @@ sub process {
my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
$realline_next);
#print "LINE<$line>\n";
- if ($linenr >= $suppress_statement &&
+ if ($linenr > $suppress_statement &&
$realcnt && $sline =~ /.\s*\S/) {
($stat, $cond, $line_nr_next, $remain_next, $off_next) =
ctx_statement_block($linenr, $realcnt, 0);
--
2.10.0.rc2.1.g053435c