[PATCH 07/13] checkpatch: suspect code indent must stop at #else/#elif

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Andy Whitcroft
Date: Friday, October 3, 2008 - 8:25 am

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>
---
 scripts/checkpatch.pl |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4680ccf..c479bde 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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
-- 
1.6.0.1.451.gc8d31

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/13] checkpatch: update to version 0.24, Andy Whitcroft, (Fri Oct 3, 8:25 am)
[PATCH 01/13] checkpatch: do is not a possible type, Andy Whitcroft, (Fri Oct 3, 8:25 am)
[PATCH 02/13] checkpatch: labels are not possible types, Andy Whitcroft, (Fri Oct 3, 8:25 am)
[PATCH 05/13] checkpatch: accept any sized le/be type, Andy Whitcroft, (Fri Oct 3, 8:25 am)
[PATCH 07/13] checkpatch: suspect code indent must stop at ..., Andy Whitcroft, (Fri Oct 3, 8:25 am)