mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-15 16:53:54 +08:00
checkpatch: reduce false positives when checking void function return statements
The previous patch had a few too many false positives on styles that should be acceptable. Signed-off-by: Joe Perches <joe@perches.com> Tested-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f9af420fc8
commit
b43ae21bd1
@ -3476,12 +3476,17 @@ sub process {
|
||||
}
|
||||
}
|
||||
|
||||
# unnecessary return in a void function? (a single leading tab, then return;)
|
||||
if ($sline =~ /^\+\treturn\s*;\s*$/ &&
|
||||
$prevline =~ /^\+/) {
|
||||
# unnecessary return in a void function
|
||||
# at end-of-function, with the previous line a single leading tab, then return;
|
||||
# and the line before that not a goto label target like "out:"
|
||||
if ($sline =~ /^[ \+]}\s*$/ &&
|
||||
$prevline =~ /^\+\treturn\s*;\s*$/ &&
|
||||
$linenr >= 3 &&
|
||||
$lines[$linenr - 3] =~ /^[ +]/ &&
|
||||
$lines[$linenr - 3] !~ /^[ +]\s*$Ident\s*:/) {
|
||||
WARN("RETURN_VOID",
|
||||
"void function return statements are not generally useful\n" . $herecurr);
|
||||
}
|
||||
"void function return statements are not generally useful\n" . $hereprev);
|
||||
}
|
||||
|
||||
# if statements using unnecessary parentheses - ie: if ((foo == bar))
|
||||
if ($^V && $^V ge 5.10.0 &&
|
||||
|
Loading…
Reference in New Issue
Block a user