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

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

checkpatch: improve the SUSPECT_CODE_INDENT test 

The current SUSPECT_CODE_INDENT test does not recognize several
defective code style defects where code following a logical test is
inappropriately indented.

Before this patch, for code like:

	if (foo)
	bar();

checkpatch would not emit a warning.

Improve the test to warn when code after a logical test has the same
indentation as the logical test.

Perform the same indentation test for "else" blocks too.

Link: http://lkml.kernel.org/r/df2374b68c4a68af2b7ef08afe486584811f610a.1493683942.git.joe@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 74fd4f34

scripts/checkpatch.pl

+3 −1
Original line number Diff line number Diff line
@@ -3354,7 +3354,7 @@ sub process { 
		}



# Check relative indent for conditionals and blocks.

		if ($line =~ /\b(?:(?:if|while|for|(?:[a-z_]+|)for_each[a-z_]+)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {

		if ($line =~ /\b(?:(?:if|while|for|(?:[a-z_]+|)for_each[a-z_]+)\s*\(|(?:do|else)\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {

			($stat, $cond, $line_nr_next, $remain_next, $off_next) =

				ctx_statement_block($linenr, $realcnt, 0)

					if (!defined $stat);
@@ -3446,6 +3446,8 @@ sub process { 
			if ($check && $s ne '' &&

			    (($sindent % 8) != 0 ||

			     ($sindent < $indent) ||

			     ($sindent == $indent &&

			      ($s !~ /^\s*(?:\}|\{|else\b)/)) ||

			     ($sindent > $indent + 8))) {

				WARN("SUSPECT_CODE_INDENT",

				     "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");