Messages in this thread Patch in this message | | | From | Andy Whitcroft <> | Subject | [PATCH 3/7] checkpatch: indent checks -- stop when we run out of continuation lines | Date | Fri, 21 Aug 2009 22:46:06 +0100 |
| |
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> --- scripts/checkpatch.pl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index aa009a3..b6f267b 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++; + } } } -- 1.6.3.3
| |