]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
checkpatch: ensure we actually detect if assignments split across lines
authorAndy Whitcroft <apw@canonical.com>
Tue, 6 Jan 2009 22:41:29 +0000 (14:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2009 23:59:17 +0000 (15:59 -0800)
When checking for assignments within if conditionals we check the whole of
the condition, but the match is performed using a line constrained regular
expression.  This means we can miss split conditionals or those on the
second line.  Allow the check to span lines.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
scripts/checkpatch.pl

index a521d493b0c8600790d20b9574fc445d98f18d4a..c39ce0b663b4310f3131cdc3795e98df590afc48 100755 (executable)
@@ -2048,7 +2048,7 @@ sub process {
                    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
                        my ($s, $c) = ($stat, $cond);
 
-                       if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/) {
+                       if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) {
                                ERROR("do not use assignment in if condition\n" . $herecurr);
                        }