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>
This commit is contained in:
Andy Whitcroft 2008-10-15 22:02:32 -07:00 committed by Linus Torvalds
parent 8ed22cad9c
commit f16fa28f7b

View file

@ -1468,6 +1468,12 @@ sub process {
while ($cond_ptr != $cond_lines) { while ($cond_ptr != $cond_lines) {
$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: # Ignore:
# 1) blank lines, they should be at 0, # 1) blank lines, they should be at 0,
# 2) preprocessor lines, and # 2) preprocessor lines, and