Messages in this thread Patch in this message | | | From | Utkarsh Verma <> | Subject | [PATCH v4] checkpatch: add check for continue statement in UNNECESSARY_ELSE | Date | Sun, 3 Oct 2021 11:08:56 +0530 |
| |
UNNECESSARY_ELSE only checks for the usage of else after a return or break. But the same logic applies for the continue statement.
An else branch used after a continue statement is unnecessary. So add a test for the continue statement, too.
Signed-off-by: Utkarsh Verma <utkarshverma294@gmail.com> --- scripts/checkpatch.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index c27d2312cfc3..0eee086d87fe 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -4011,15 +4011,15 @@ sub process { # check indentation of any line with a bare else # (but not if it is a multiple line "if (foo) return bar; else return baz;") -# if the previous line is a break or return and is indented 1 tab more... +# if the previous line is a break or continue or return and is indented 1 tab more... if ($sline =~ /^\+([\t]+)(?:}[ \t]*)?else(?:[ \t]*{)?\s*$/) { my $tabs = length($1) + 1; - if ($prevline =~ /^\+\t{$tabs,$tabs}break\b/ || - ($prevline =~ /^\+\t{$tabs,$tabs}return\b/ && - defined $lines[$linenr] && - $lines[$linenr] !~ /^[ \+]\t{$tabs,$tabs}return/)) { + if ($prevline =~ /^\+\t{$tabs,$tabs}(break|continue|return)\b/ && + !($1 eq "return" && + defined $lines[$linenr] && + $lines[$linenr] =~ /^[ \+]\t{$tabs,$tabs}return/)) { WARN("UNNECESSARY_ELSE", - "else is not generally useful after a break or return\n" . $hereprev); + "else is not generally useful after a $1\n" . $hereprev); } } -- 2.25.1
| |