[PATCH] checkpatch: Support wide strings

From: Joe Perches
Date: Tue Oct 17 2017 - 20:11:14 EST


Allow prefixing typical strings with L for wide strings

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 scripts/checkpatch.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 359c02b0954e..9f04f803e96b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -393,7 +393,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]?};
@@ -5262,13 +5262,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);
  }
-- 
2.10.0.rc2.1.g053435c