mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Whitcroft <apw@shadowen.org>
To: Andrew Morton <akpm@osdl.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>,
	Joel Schopp <jschopp@austin.ibm.com>, Ingo Molnar <mingo@elte.hu>,
	linux-kernel@vger.kernel.org, Andy Whitcroft <apw@shadowen.org>
Subject: [PATCH 7/9] checkpatch: comment ends inside strings is most likely not an open comment
Date: Thu, 23 Oct 2008 12:06:37 +0100	[thread overview]
Message-ID: <1224759999-21389-8-git-send-email-apw@shadowen.org> (raw)
In-Reply-To: <1224759999-21389-1-git-send-email-apw@shadowen.org>

When we are detecting whether a comment is open when we start a hunk
we check for the first comment edge in the hunk and assume its inverse.
However if the hunk contains something like below, then we will assume
that a comment was open.  Update this heuristic to see if the comment edge is
obviously within double quotes and ignore it if so:

	foo(" */);

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
 scripts/checkpatch.pl |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c73fd44..5acc48a 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -367,7 +367,7 @@ sub sanitise_line {
 			}
 		}
 
-		#print "SQ:$sanitise_quote\n";
+		#print "c<$c> SQ<$sanitise_quote>\n";
 		if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
 			substr($res, $off, 1, $;);
 		} elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
@@ -1103,8 +1103,11 @@ sub process {
 				$cnt--;
 				#print "RAW<$rawlines[$ln - 1]>\n";
 				last if (!defined $rawlines[$ln - 1]);
-				($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);
-				last if (defined $edge);
+				if ($rawlines[$ln - 1] =~ m@(/\*|\*/)@ &&
+				    $rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {
+					($edge) = $1;
+					last;
+				}
 			}
 			if (defined $edge && $edge eq '*/') {
 				$in_comment = 1;
-- 
1.6.0.2.711.gf1ba4


  parent reply	other threads:[~2008-10-23 11:08 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-23 11:06 [PATCH 0/9] checkpatch: update to versoin 0.25 Andy Whitcroft
2008-10-23 11:06 ` [PATCH 1/9] checkpatch: add checks for in_atomic() Andy Whitcroft
2008-10-23 11:06 ` [PATCH 2/9] checkpatch: comment detection may miss an implied comment on the last hunk Andy Whitcroft
2008-10-23 11:06 ` [PATCH 3/9] checkpatch: widen implied comment detection to allow multiple stars Andy Whitcroft
2008-10-23 11:06 ` [PATCH 4/9] checkpatch: structure member assignments are not complex Andy Whitcroft
2008-10-23 11:06 ` [PATCH 5/9] checkpatch: __weak is an official attribute Andy Whitcroft
2008-10-23 11:06 ` [PATCH 6/9] checkpatch: detect multiple bitfield declarations Andy Whitcroft
2008-10-23 11:06 ` Andy Whitcroft [this message]
2008-10-23 11:06 ` [PATCH 8/9] checkpatch: dissallow spaces between stars in pointer types Andy Whitcroft
2008-10-23 11:06 ` [PATCH 9/9] checkpatch: version: 0.25 Andy Whitcroft

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1224759999-21389-8-git-send-email-apw@shadowen.org \
    --to=apw@shadowen.org \
    --cc=akpm@osdl.org \
    --cc=jschopp@austin.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=rdunlap@xenotime.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®