Commit 7e781f67 authored Sep 11, 2013 by Joe Perches Committed by Linus Torvalds Sep 11, 2013

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>

parent d5e616fc

scripts/checkpatch.pl

+9 −5

Original line number	Diff line number	Diff line
		@@ -3302,11 +3302,15 @@ sub process {
		$var !~ /^(?:Clear\|Set\|TestClear\|TestSet\|)Page[A-Z]/ &&
		#Ignore SI style variants like nS, mV and dB (ie: max_uV, regulator_min_uA_show)
		$var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/) {
		while ($var =~ m{($Ident)}g) {
		my $word = $1;
		next if ($word !~ /[A-Z][a-z]\|[a-z][A-Z]/);
		seed_camelcase_includes() if ($check);
		if (!defined $camelcase{$var}) {
		$camelcase{$var} = 1;
		if (!defined $camelcase{$word}) {
		$camelcase{$word} = 1;
		CHK("CAMELCASE",
		"Avoid CamelCase: <$var>\n" . $herecurr);
		"Avoid CamelCase: <$word>\n" . $herecurr);
		}
		}
		}
		}

Admin message