patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

scripts: checkpatch: allow leading spaces in multi-lines macros

Browse source 
With the current clang-format rules, we have that multi-line macros that
contain empty lines (usual in driver definition macros) are formatted
with spaces only, no leading tabs. For example:

```c
 #define MYDRIVER_DEFINE(i)                 \
 	 struct mydriver_data data##i;      \
                                            \ /* starts with spaces */
	 struct mydriver_config config##i;  \
	 ...
```

This patch makes checkpatch ignore such cases, so that clang-format can
be used in tree while keeping checkpatch happy.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-06-16 15:50:44 +02:00 committed by Carles Cufí
parent 2904b0020e
commit abaa5b8dfa
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/checkpatch.pl
View file

@ -3284,9 +3284,11 @@ sub process {
next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/); next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/);
# at the beginning of a line any tabs must come first and anything # at the beginning of a line any tabs must come first and anything
# more than $tabsize must use tabs. # more than $tabsize must use tabs, except multi-line macros which may start
# with spaces on empty lines
if ($rawline =~ /^\+\s* \t\s*\S/ || if ($rawline =~ /^\+\s* \t\s*\S/ ||
$rawline =~ /^\+\s* \s*/) { $rawline =~ /^\+\s* \s*/ &&
$rawline !~ /^\+\s*\\$/) {
my $herevet = "$here\n" . cat_vet($rawline) . "\n"; my $herevet = "$here\n" . cat_vet($rawline) . "\n";
$rpt_cleaners = 1; $rpt_cleaners = 1;
if (ERROR("CODE_INDENT", if (ERROR("CODE_INDENT",
@ -3549,7 +3551,9 @@ sub process {
# 1) within comments # 1) within comments
# 2) indented preprocessor commands # 2) indented preprocessor commands
# 3) hanging labels # 3) hanging labels
if ($rawline =~ /^\+ / && $line !~ /^\+ *(?:$;|#|$Ident:)/) { # 4) empty lines in multi-line macros
if ($rawline =~ /^\+ / && $line !~ /^\+ *(?:$;|#|$Ident:)/ &&
$rawline !~ /^\+\s+\\$/) {
my $herevet = "$here\n" . cat_vet($rawline) . "\n"; my $herevet = "$here\n" . cat_vet($rawline) . "\n";
if (WARN("LEADING_SPACE", if (WARN("LEADING_SPACE",
"please, no spaces at the start of a line\n" . $herevet) && "please, no spaces at the start of a line\n" . $herevet) &&