[PATCH] checkpatch: fix erroneous indentation errors

[PATCH] checkpatch: fix erroneous indentation errors

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

In a few cases, checkpatch gives false indentation CHECKs:

@@ ... @@
-	foo(1, 2, 3,
+	foo(1, 2, 3, 4,
 	    5, 6, 7, 8);

will warn.

@@ ... @@
	foo(1, 2, 3, 4,
-	    5, 6, 7, 8);
+		5, 6, 7, 8);

will not warn.

Change this. The only disadvantage of the new code is
that it will warn about context-only indentation problems,
e.g.

@@ ... @@
	foo(1, 2, 3, 4,
		5, 6, 7, 8);
-	unrelated();

will cause a warning now. It could probably be prevented
by a match on $rawline, but I wasn't sure how to do that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 scripts/checkpatch.pl |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e5bd60f..6a97c3b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1841,14 +1841,14 @@ sub process {
 
 # check multi-line statement indentation matches previous line
 		if ($^V && $^V ge 5.10.0 &&
-		    $prevline =~ /^\+(\t*)(if \(|$Ident\().*(\&\&|\|\||,)\s*$/) {
-			$prevline =~ /^\+(\t*)(.*)$/;
+		    $prevline =~ /^[ \+](\t*)(if \(|$Ident\().*(\&\&|\|\||,)\s*$/) {
+			$prevline =~ /^[ \+](\t*)(.*)$/;
 			my $oldindent = $1;
 			my $rest = $2;
 
 			my $pos = pos_last_openparen($rest);
 			if ($pos >= 0) {
-				$line =~ /^\+([ \t]*)/;
+				$line =~ /^[\+ ]([ \t]*)/;
 				my $newindent = $1;
 
 				my $goodtabindent = $oldindent .
-- 
1.7.10.4