Commit f16fa28f authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds

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: 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 8ed22cad
...@@ -1468,6 +1468,12 @@ sub process { ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment