mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 14:02:10 +00:00
checkpatch: suspect indent handle macro continuation
When ignoring a macro in the middle of a conditional, we need to ignore the macro start and any continuation lines. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
bb44ad39c8
commit
740504c61f
@ -1465,6 +1465,7 @@ sub process {
|
||||
}
|
||||
|
||||
my $cond_ptr = -1;
|
||||
$continuation = 0;
|
||||
while ($cond_ptr != $cond_lines) {
|
||||
$cond_ptr = $cond_lines;
|
||||
|
||||
@ -1478,9 +1479,11 @@ sub process {
|
||||
# 1) blank lines, they should be at 0,
|
||||
# 2) preprocessor lines, and
|
||||
# 3) labels.
|
||||
if ($s =~ /^\s*?\n/ ||
|
||||
if ($continuation ||
|
||||
$s =~ /^\s*?\n/ ||
|
||||
$s =~ /^\s*#\s*?/ ||
|
||||
$s =~ /^\s*$Ident\s*:/) {
|
||||
$continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
|
||||
$s =~ s/^.*?\n//;
|
||||
$cond_lines++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user