diff options
| author | Elyes Haouas <ehaouas@noos.fr> | 2022-07-13 16:52:48 +0200 |
|---|---|---|
| committer | Martin L Roth <gaumless@tutanota.com> | 2022-07-19 01:47:34 +0000 |
| commit | e235a0de181d3b30ce7c3653350cd7d24ff1ea03 (patch) | |
| tree | fb9b67db10831e66ec87698e3167f004bd4b25a6 | |
| parent | 71bfcf528dd54329db4466f11ae91f8d3a33adaf (diff) | |
lint/checkpatch: Update 'uncoalesced string fragments'
This reduce the difference with linux v5.19-rc7.
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Change-Id: I21b2a0d87cbf610fc48e273ed78ab779ad4a6932
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65832
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@tutanota.com>
| -rwxr-xr-x | util/lint/checkpatch.pl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl index 72c0f365d9..2bc74eb65c 100755 --- a/util/lint/checkpatch.pl +++ b/util/lint/checkpatch.pl @@ -5720,9 +5720,15 @@ sub process { } # uncoalesced string fragments - if ($line =~ /$String\s*"/) { - WARN("STRING_FRAGMENTS", - "Consecutive strings are generally better as a single string\n" . $herecurr); + if ($line =~ /$String\s*[Lu]?"/) { + if (WARN("STRING_FRAGMENTS", + "Consecutive strings are generally better as a single string\n" . $herecurr) && + $fix) { + while ($line =~ /($String)(?=\s*")/g) { + my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]); + $fixed[$fixlinenr] =~ s/\Q$extracted_string\E\s*"/substr($extracted_string, 0, -1)/e; + } + } } # check for non-standard and hex prefixed decimal printf formats |