summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-07-11 01:52:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-11 02:32:35 +0300
commitca8198640fa9aeea71ae61b02fee6ee5e097f243 (patch)
tree3d3390aa3c2784989d7b1165743a29af122e157e /scripts
parentfe658f94b2c911729afbffeeb1f5f03f0a26d9e6 (diff)
downloadlinux-ca8198640fa9aeea71ae61b02fee6ee5e097f243.tar.xz
checkpatch: fix stepping through statements with $stat and ctx_statement_block
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. Link: http://lkml.kernel.org/r/71b25979c90412133c717084036c9851cd2b7bcb.1496862585.git.joe@perches.com Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bc2417711b6a..2f61f54b8940 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);