Re: [PATCH] checkpatch: Extend CamelCase types and ignore existingCamelCase uses in a patch

[Sarah Sharp]

On Tue, Sep 03, 2013 at 10:25:21AM -0700, Joe Perches wrote:
> Extend the CamelCase words found to include structure members.
> 
> In https://lkml.org/lkml/2013/9/3/318 Sarah Sharp (mostly) wrote: 
> 
> "In general, if checkpatch.pl complains about a variable a patch
> introduces that's CamelCase, you should pay attention to it.
> Otherwise, [] ignore it."
> 
> So, if checking a patch, scan the original patched file if it's
> available and add any preexisting CamelCase types so reuses do
> not generate CamelCase messages.
> 
> That also means Andrew's not so cruelly spurned anymore.
> https://lkml.org/lkml/2013/2/22/426
> 
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> Suggested-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
> Suggested-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

Thanks!  Will this mean checkpatch.pl still complains on CamelCase names
if it's run against a file?  I think that's still valuable.

Sarah Sharp

> ---
>  scripts/checkpatch.pl | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 9ba4fc4..b98a996 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -424,7 +424,7 @@ sub seed_camelcase_file {
>  		if ($line =~ /^[ \t]*(?:#[ \t]*define|typedef\s+$Type)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)/) {
>  			$camelcase{$1} = 1;
>  		}
> -	        elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*\(/) {
> +	        elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[\(\[,;]/) {
>  			$camelcase{$1} = 1;
>  		}
>  	}
> @@ -1593,6 +1593,8 @@ sub process {
>  	my @setup_docs = ();
>  	my $setup_docs = 0;
>  
> +	my $camelcase_file_seeded = 0;
> +
>  	sanitise_line_reset();
>  	my $line;
>  	foreach my $rawline (@rawlines) {
> @@ -3377,7 +3379,13 @@ sub process {
>  				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 ($check) {
> +						seed_camelcase_includes();
> +						if (!$file && !$camelcase_file_seeded) {
> +							seed_camelcase_file($realfile);
> +							$camelcase_file_seeded = 1;
> +						}
> +					}
>  					if (!defined $camelcase{$word}) {
>  						$camelcase{$word} = 1;
>  						CHK("CAMELCASE",
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/