From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: trix@redhat.com, linux-kernel@vger.kernel.org,
cocci <cocci@systeme.lip6.fr>
Subject: [Cocci] [PATCH] checkpatch: Allow --fix removal of unnecessary break statements
Date: Sun, 18 Oct 2020 12:49:26 -0700 [thread overview]
Message-ID: <dfe24da760056e31d90ff639b47c494263b5f4a7.camel@perches.com> (raw)
In-Reply-To: <alpine.DEB.2.22.394.2010172016370.9440@hadrien>
switch/case use of break after a return or goto is unnecessary.
There is an existing warning for these uses, so add a --fix option too.
Signed-off-by: Joe Perches <joe@perches.com>
---
For today's next, this would remove ~300 instances like:
case FOO:
return bar;
break;
or
case FOO:
goto bar;
break;
scripts/checkpatch.pl | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index fab38b493cef..22263b278e87 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3678,8 +3678,11 @@ sub process {
if ($sline =~ /^\+([\t]+)break\s*;\s*$/) {
my $tabs = $1;
if ($prevline =~ /^\+$tabs(?:goto|return)\b/) {
- WARN("UNNECESSARY_BREAK",
- "break is not useful after a goto or return\n" . $hereprev);
+ if (WARN("UNNECESSARY_BREAK",
+ "break is not useful after a goto or return\n" . $hereprev) &&
+ $fix) {
+ fix_delete_line($fixlinenr, $rawline);
+ }
}
}
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
next prev parent reply other threads:[~2020-10-18 19:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201017160928.12698-1-trix@redhat.com>
2020-10-17 16:24 ` [Cocci] [RFC] treewide: cleanup unreachable breaks Joe Perches
2020-10-17 18:21 ` Julia Lawall
2020-10-17 19:00 ` Joe Perches
2020-10-18 19:49 ` Joe Perches [this message]
2020-10-18 20:07 ` [Cocci] [PATCH] checkpatch: Allow --fix removal of unnecessary break statements Tom Rix
2020-10-18 20:19 ` Joe Perches
2020-10-19 12:55 ` Tom Rix
2020-10-19 15:16 ` Joe Perches
2020-10-19 15:36 ` [Cocci] [PATCH V2] " Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dfe24da760056e31d90ff639b47c494263b5f4a7.camel@perches.com \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=cocci@systeme.lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).