Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9ef2684c033d325b08133e96e8744b4da9b69a58

Authored by Heinrich Schuchardt
Committed by Tom Rini
1 parent 2d5e6b4aac
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff

scripts/checkpatch.pl
Diff comments   View file @ 9ef2684
... ... @@ -392,7 +392,7 @@
392 392 our $Hex = qr{(?i)0x[0-9a-f]+$Int_type?};
393 393 our $Int = qr{[0-9]+$Int_type?};
394 394 our $Octal = qr{0[0-7]+$Int_type?};
395   -our $String = qr{"[X\t]*"};
  395 +our $String = qr{(?:\bL)?"[X\t]*"};
396 396 our $Float_hex = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
397 397 our $Float_dec = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
398 398 our $Float_int = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
399 399  
... ... @@ -5254,13 +5254,14 @@
5254 5254 }
5255 5255  
5256 5256 # concatenated string without spaces between elements
5257   - if ($line =~ /$String[A-Z_]/ || $line =~ /[A-Za-z0-9_]$String/) {
  5257 + if ($line =~ /$String[A-Z_]/ ||
  5258 + ($line =~ /([A-Za-z0-9_]+)$String/ && $1 !~ /^L$/)) {
5258 5259 CHK("CONCATENATED_STRING",
5259 5260 "Concatenated strings should use spaces between elements\n" . $herecurr);
5260 5261 }
5261 5262  
5262 5263 # uncoalesced string fragments
5263   - if ($line =~ /$String\s*"/) {
  5264 + if ($line =~ /$String\s*L?"/) {
5264 5265 WARN("STRING_FRAGMENTS",
5265 5266 "Consecutive strings are generally better as a single string\n" . $herecurr);
5266 5267 }