diff options
| author | Andy Whitcroft <apw@canonical.com> | 2009-01-06 14:41:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 15:59:17 -0800 |
| commit | b53c8e104ed071c47ada2adce194625ab03d9f3d (patch) | |
| tree | 52354de0c3b69be0cf5d0eb85510f82b74eb807a /scripts | |
| parent | 2d1bafd799ee0442979e6ce4145d58b69d3cade2 (diff) | |
| download | linux-b53c8e104ed071c47ada2adce194625ab03d9f3d.tar.bz2 | |
checkpatch: ensure we actually detect if assignments split across lines
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index a521d493b0c8..c39ce0b663b4 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -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); } |