Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114783
b: refs/heads/master
c: 740504c
h: refs/heads/master
i:
  114781: abc169a
  114779: 0d8a750
  114775: 724a97e
  114767: a8c81e7
  114751: 02a2391
v: v3
  • Loading branch information
Andy Whitcroft authored and Linus Torvalds committed Oct 16, 2008
1 parent 932329b commit dff4718
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb44ad39c886401e1ffe0876565f8b3fcea64e9d
refs/heads/master: 740504c61f79a932564fb7117d79ad53d950b201
5 changes: 4 additions & 1 deletion trunk/scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1465,6 +1465,7 @@ sub process {
}

my $cond_ptr = -1;
$continuation = 0;
while ($cond_ptr != $cond_lines) {
$cond_ptr = $cond_lines;

Expand All @@ -1478,9 +1479,11 @@ sub process {
# 1) blank lines, they should be at 0,
# 2) preprocessor lines, and
# 3) labels.
if ($s =~ /^\s*?\n/ ||
if ($continuation ||
$s =~ /^\s*?\n/ ||
$s =~ /^\s*#\s*?/ ||
$s =~ /^\s*$Ident\s*:/) {
$continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
$s =~ s/^.*?\n//;
$cond_lines++;
}
Expand Down

0 comments on commit dff4718

Please sign in to comment.