From dff47181c70551d708f3d2a488890c0f52908989 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 15 Oct 2008 22:02:35 -0700 Subject: [PATCH] --- yaml --- r: 114783 b: refs/heads/master c: 740504c61f79a932564fb7117d79ad53d950b201 h: refs/heads/master i: 114781: abc169a0778fd6ea500a85854ec237c38be7529c 114779: 0d8a75099d8ee3eb94c269c66326c6f63a49ed40 114775: 724a97e54ed3ad3ea66a5c945f6a6c97f8c698ab 114767: a8c81e7bef0638a6251785aadc3b2467176833eb 114751: 02a2391690670d09d4a156ed908fd246f1fce6e2 v: v3 --- [refs] | 2 +- trunk/scripts/checkpatch.pl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d54a721cfcb7..cbe5cfb7838a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb44ad39c886401e1ffe0876565f8b3fcea64e9d +refs/heads/master: 740504c61f79a932564fb7117d79ad53d950b201 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 2c1afba57580..862e8e0e86ae 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -1465,6 +1465,7 @@ sub process { } my $cond_ptr = -1; + $continuation = 0; while ($cond_ptr != $cond_lines) { $cond_ptr = $cond_lines; @@ -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++; }