---

yaml --- r: 217584 b: refs/heads/master c: fb2d2c1 h: refs/heads/master v: v3
git-mirror · Oct 26, 2010 · 7f2bbd3 · 7f2bbd3
1 parent 19b898a
commit 7f2bbd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2c0a23514d8ac4ed10a8e742467cfb72ca3bed8
+refs/heads/master: fb2d2c1b5825503d30fb6f2dc328dbe4a47d9794
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
@@ -2183,15 +2183,16 @@ sub process {
 			my $value = $2;
 
 			# Flatten any parentheses
-			$value =~ s/\)\(/\) \(/g;
+			$value =~ s/\(/ \(/g;
+			$value =~ s/\)/\) /g;
 			while ($value =~ s/\[[^\{\}]*\]/1/ ||
 			       $value !~ /(?:$Ident|-?$Constant)\s*
 					     $Compare\s*
 					     (?:$Ident|-?$Constant)/x &&
 			       $value =~ s/\([^\(\)]*\)/1/) {
 			}
-
-			if ($value =~ /^(?:$Ident|-?$Constant)$/) {
+#print "value<$value>\n";
+			if ($value =~ /^\s*(?:$Ident|-?$Constant)\s*$/) {
 				ERROR("return is not a function, parentheses are not required\n" . $herecurr);
 
 			} elsif ($spacing !~ /\s+/) {