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

Commit 53210168 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: toughen trailing if statement checks and extend them to while and for 



Extend the trailing statement checks to report a trailing semi-colon ';'
as we really want it on the next line and indented so it is really really
obvious.  Also extend the tests to include while and for.

Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d31cfce

scripts/checkpatch.pl

+5 −5
Original line number Diff line number Diff line
@@ -1269,8 +1269,8 @@ sub process { 
				$ctx_ln++;

			}



			##print "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n";

			##print "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n";

			#print "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n";

			#print "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n";



			if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln -1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) {

				ERROR("that open brace { should be on the previous line\n" .
@@ -1713,7 +1713,7 @@ sub process { 
		}



# Check for illegal assignment in if conditional.

		if ($line =~ /\bif\s*\(/) {

		if ($line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {

			my ($s, $c) = ($stat, $cond);



			if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/) {
@@ -1725,8 +1725,8 @@ sub process { 
			substr($s, 0, length($c), '');

			$s =~ s/\n.*//g;

			$s =~ s/$;//g; 	# Remove any comments

			if (length($c) && $s !~ /^\s*({|;|)\s*\\*\s*$/ &&

			    $c !~ /^.\s*\#\s*if/)

			if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&

			    $c !~ /}\s*while\s*/)

			{

				ERROR("trailing statements should be on next line\n" . $herecurr);

			}