diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2017-10-29 08:28:52 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-29 10:13:10 -0400 |
| commit | 9ef2684c033d325b08133e96e8744b4da9b69a58 (patch) | |
| tree | f47ae6b4869123df1624076fbbabdc6b8034ad18 | |
| parent | 2d5e6b4aac59d3a93773f19839fbb86d9e704fb7 (diff) | |
checkpatch: Support wide strings
Allow prefixing typical strings with L for wide strings
Patch originally by Joe Perches
https://lkml.org/lkml/2017/10/17/1117
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rwxr-xr-x | scripts/checkpatch.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 4142f5c837..e450826c36 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -392,7 +392,7 @@ our $Binary = qr{(?i)0b[01]+$Int_type?}; our $Hex = qr{(?i)0x[0-9a-f]+$Int_type?}; our $Int = qr{[0-9]+$Int_type?}; our $Octal = qr{0[0-7]+$Int_type?}; -our $String = qr{"[X\t]*"}; +our $String = qr{(?:\bL)?"[X\t]*"}; our $Float_hex = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?}; our $Float_dec = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?}; our $Float_int = qr{(?i)[0-9]+e-?[0-9]+[fl]?}; @@ -5254,13 +5254,14 @@ sub process { } # concatenated string without spaces between elements - if ($line =~ /$String[A-Z_]/ || $line =~ /[A-Za-z0-9_]$String/) { + if ($line =~ /$String[A-Z_]/ || + ($line =~ /([A-Za-z0-9_]+)$String/ && $1 !~ /^L$/)) { CHK("CONCATENATED_STRING", "Concatenated strings should use spaces between elements\n" . $herecurr); } # uncoalesced string fragments - if ($line =~ /$String\s*"/) { + if ($line =~ /$String\s*L?"/) { WARN("STRING_FRAGMENTS", "Consecutive strings are generally better as a single string\n" . $herecurr); } |