Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af207524 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

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@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reported-by: default avatarCharlemagne Lasse <charlemagnelasse@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0616efa4

scripts/checkpatch.pl

+12 −7
Original line number Diff line number Diff line
@@ -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);

			}