The patch titled
Subject: checkpatch: improve the block comment * alignment test
has been removed from the -mm tree. Its filename was
checkpatch-improve-the-block-comment-alignment-test.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: checkpatch: improve the block comment * alignment test
An "uninitialized value" is emitted when a block comment starts on
the same line as a statement.
Fix this and make the test use a little fewer cpu cycles too.
Link: http://lkml.kernel.org/r/3c9993320c2182d37f53ac540878cfef59c3f62d.1473365956.git.joe@xxxxxxxxxxx
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Reported-by: Charlemagne Lasse <charlemagnelasse@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
scripts/checkpatch.pl | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff -puN scripts/checkpatch.pl~checkpatch-improve-the-block-comment-alignment-test scripts/checkpatch.pl
--- a/scripts/checkpatch.pl~checkpatch-improve-the-block-comment-alignment-test
+++ a/scripts/checkpatch.pl
@@ -3005,18 +3005,23 @@ sub process {
# Block comment * alignment
if ($prevline =~ /$;[ \t]*$/ && #ends in comment
- (($prevrawline =~ /^\+.*?\/\*/ && #starting /*
+ $line =~ /^\+[ \t]*$;/ && #leading comment
+ $rawline =~ /^\+[ \t]*\*/ && #leading *
+ (($prevrawline =~ /^\+.*?\/\*/ && #leading /*
$prevrawline !~ /\*\/[ \t]*$/) || #no trailing */
- $prevrawline =~ /^\+[ \t]*\*/) && #starting *
- $rawline =~ /^\+[ \t]*\*/) { #rawline *
+ $prevrawline =~ /^\+[ \t]*\*/)) { #leading *
+ my $oldindent;
$prevrawline =~ m@^\+([ \t]*/?)\*@;
- my $oldindent = expand_tabs($1);
+ if (defined($1)) {
+ $oldindent = expand_tabs($1);
+ } else {
+ $prevrawline =~ m@^\+(.*/?)\*@;
+ $oldindent = expand_tabs($1);
+ }
$rawline =~ m@^\+([ \t]*)\*@;
my $newindent = $1;
- my $test_comment = '^\\+' . "$;" x (length($newindent) + 1);
$newindent = expand_tabs($newindent);
- if ($line =~ /$test_comment/ &&
- length($oldindent) ne length($newindent)) {
+ if (length($oldindent) ne length($newindent)) {
WARN("BLOCK_COMMENT_STYLE",
"Block comments should align the * on each line\n" . $hereprev);
}
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
