checkpatch: fix complex macros handling of square brackets

Andy Whitcroft · torvalds · commit c81769fdc84e · 2012-01-10T16:30:51.000-08:00
Signed-off-by: Andy Whitcroft &lt;apw@canonical.com&gt;
Cc: Joe Perches &lt;joe@perches.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -2815,7 +2815,7 @@ sub process {
 			# Flatten any parentheses and braces
 			while ($dstat =~ s/\([^\(\)]*\)/1/ ||
 			       $dstat =~ s/\{[^\{\}]*\}/1/ ||
-			       $dstat =~ s/\[[^\{\}]*\]/1/)
+			       $dstat =~ s/\[[^\[\]]*\]/1/)
 			{
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -2815,7 +2815,7 @@ sub process {`
`2815`	`2815`	`# Flatten any parentheses and braces`
`2816`	`2816`	`while ($dstat =~ s/\([^\(\)]*\)/1/ \|\|`
`2817`	`2817`	`$dstat =~ s/\{[^\{\}]*\}/1/ \|\|`
`2818`		`- $dstat =~ s/\[[^\{\}]*\]/1/)`
	`2818`	`+ $dstat =~ s/\[[^\[\]]*\]/1/)`
`2819`	`2819`	`{`
`2820`	`2820`	`}`
`2821`	`2821`