checkpatch: handle string concatenation in simple #defines

Andy Whitcroft · torvalds · commit e45bab8ebfee · 2012-03-23T16:58:36.000-07:00
Adjacent strings indicate concatentation, therefore look at identifiers
directly adjacent to literal strings as strings too.  This allows us to
better detect the form below and accept it as a simple constant:

    #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

Signed-off-by: Andy Whitcroft &lt;apw@canonical.com&gt;
Cc: Joe Perches &lt;joe@perches.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -2894,6 +2894,12 @@ sub process {
 			{
 			}
 
+			# Flatten any obvious string concatentation.
+			while ($dstat =~ s/("X*")\s*$Ident/$1/ ||
+			       $dstat =~ s/$Ident\s*("X*")/$1/)
+			{
+			}
+
 			my $exceptions = qr{
 				$Declare|
 				module_param_named|

Original file line number	Diff line number	Diff line change
`@@ -2894,6 +2894,12 @@ sub process {`
`2894`	`2894`	`{`
`2895`	`2895`	`}`
`2896`	`2896`
	`2897`	`+ # Flatten any obvious string concatentation.`
	`2898`	`+ while ($dstat =~ s/("X")\s$Ident/$1/ \|\|`
	`2899`	`+ $dstat =~ s/$Ident\s("X")/$1/)`
	`2900`	`+ {`
	`2901`	`+ }`
	`2902`	`+`
`2897`	`2903`	`my $exceptions = qr{`
`2898`	`2904`	`$Declare\|`
`2899`	`2905`	`module_param_named\|`