diff options
author | Joe Perches <joe@perches.com> | 2013-09-11 17:23:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:58:40 -0400 |
commit | 7e781f67df436b67753a65436c0fef0a0ebf5043 (patch) | |
tree | 3fd10d6d6bb55e684adb77f9958d9db269aa9272 /scripts | |
parent | d5e616fc1c1dd673c53b682877e2d35a2862263c (diff) |
checkpatch: check CamelCase by word, not by $Lval
$Lval is a test for complete name (ie: foo->bar.Baz[1])
If any of this is CamelCase, then the current test uses the entire $Lval.
This isn't optimal because it can emit messages with foo->bar.Baz and
bar.Baz when Baz is a variable specified in an include file.
So instead, break the $Lval into words and check each word for CamelCase
uses.
Signed-off-by: Joe Perches <joe@perches.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 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 9163651edc50..6b409b0ad457 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -3302,11 +3302,15 @@ sub process { | |||
3302 | $var !~ /^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ && | 3302 | $var !~ /^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ && |
3303 | #Ignore SI style variants like nS, mV and dB (ie: max_uV, regulator_min_uA_show) | 3303 | #Ignore SI style variants like nS, mV and dB (ie: max_uV, regulator_min_uA_show) |
3304 | $var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/) { | 3304 | $var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/) { |
3305 | seed_camelcase_includes() if ($check); | 3305 | while ($var =~ m{($Ident)}g) { |
3306 | if (!defined $camelcase{$var}) { | 3306 | my $word = $1; |
3307 | $camelcase{$var} = 1; | 3307 | next if ($word !~ /[A-Z][a-z]|[a-z][A-Z]/); |
3308 | CHK("CAMELCASE", | 3308 | seed_camelcase_includes() if ($check); |
3309 | "Avoid CamelCase: <$var>\n" . $herecurr); | 3309 | if (!defined $camelcase{$word}) { |
3310 | $camelcase{$word} = 1; | ||
3311 | CHK("CAMELCASE", | ||
3312 | "Avoid CamelCase: <$word>\n" . $herecurr); | ||
3313 | } | ||
3310 | } | 3314 | } |
3311 | } | 3315 | } |
3312 | } | 3316 | } |