[PATCH] checkpatch: fix a false check against wchar/utf-16 string

AKASHI Takahiro takahiro.akashi at linaro.org
Tue Jun 16 07:43:07 CEST 2020


UEFI subsystem uses utf-16 string, but checkpatch.pl complains
about any occurrences of L"xxx" which is definitely legal.
So just suppress this kind of warning.
Precautiously, we will check u"xxx" as well.

Signed-off-by: AKASHI Takahiro <takahiro.akashi at linaro.org>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index edba36565167..b3697720787c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5462,7 +5462,7 @@ sub process {
 		}
 
 # concatenated string without spaces between elements
-		if ($line =~ /$String[A-Za-z0-9_]/ || $line =~ /[A-Za-z0-9_]$String/) {
+		if ($line =~ /$String[A-Za-z0-9_]/ || $line =~ /([A-Za-z0-9_]+[Lu]|[A-Za-z0-9_]*[A-KM-Za-tv-z0-9_])$String/) {
 			if (CHK("CONCATENATED_STRING",
 				"Concatenated strings should use spaces between elements\n" . $herecurr) &&
 			    $fix) {
-- 
2.27.0



More information about the U-Boot mailing list