diff options
| author | Andy Whitcroft <apw@canonical.com> | 2009-09-21 17:04:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 07:17:48 -0700 |
| commit | 30dad6ebecffebddf6b9947d11e31377fa900ff3 (patch) | |
| tree | 105febf76a8f69f2194383bf027cad7e8d257d1f /scripts | |
| parent | 113f04a836481e9ecc26e8dee8b0e4d52878a288 (diff) | |
| download | linux-stable-30dad6ebecffebddf6b9947d11e31377fa900ff3.tar.gz linux-stable-30dad6ebecffebddf6b9947d11e31377fa900ff3.tar.bz2 linux-stable-30dad6ebecffebddf6b9947d11e31377fa900ff3.zip | |
checkpatch: indent checks -- stop when we run out of continuation lines
Ensure we terminate when there are no futher continuation lines when
trying to determine relative indent of conditionals and their blocks.
Reported-by: John Daiker <daikerjohn@gmail.com>
Signed-off-by: Andy Whitcroft <apw@canonical.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-x | scripts/checkpatch.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index aa009a3b5b81..b6f267b72035 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1547,8 +1547,9 @@ sub process { $s =~ /^\s*#\s*?/ || $s =~ /^\s*$Ident\s*:/) { $continuation = ($s =~ /^.*?\\\n/) ? 1 : 0; - $s =~ s/^.*?\n//; - $cond_lines++; + if ($s =~ s/^.*?\n//) { + $cond_lines++; + } } } |