From 235c0a9da34d7c2054774af384506c5d247f41cf Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 23 Jul 2008 21:28:59 -0700 Subject: [PATCH] --- yaml --- r: 105384 b: refs/heads/master c: beae6332493a40116dba24928154621f2e88b9a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/checkpatch.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0dd47d11616e..72a53d48bc8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3ddcf471ea90d7ff711dbaa371ef379ed625ec0 +refs/heads/master: beae6332493a40116dba24928154621f2e88b9a9 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index fd597a4b5dad..94250d1a3a47 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -631,7 +631,7 @@ sub ctx_locate_comment { my ($first_line, $end_line) = @_; # Catch a comment on the end of the line itself. - my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*$@); + my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*(?:\\\s*)?$@); return $current_comment if (defined $current_comment); # Look through the context and try and figure out if there is a