Commit f16fa28f authored Oct 15, 2008 by Andy Whitcroft Committed by Linus Torvalds Oct 16, 2008

checkpatch: suspect code indent must stop at #else/#elif



When we hit and #else or #elif we know we are meeting an alternative piece
of code.  All bets are off on indent if we did not see the open of the
control so stop checking.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8ed22cad

scripts/checkpatch.pl

+6 −0

Original line number	Diff line number	Diff line
		@@ -1468,6 +1468,12 @@ sub process {
		while ($cond_ptr != $cond_lines) {
		$cond_ptr = $cond_lines;

		# If we see an #else/#elif then the code
		# is not linear.
		if ($s =~ /^\s\#\s(?:else\|elif)/) {
		$check = 0;
		}

		# Ignore:
		# 1) blank lines, they should be at 0,
		# 2) preprocessor lines, and