diff options
author | Joe Perches <joe@perches.com> | 2014-01-23 18:54:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:36:57 -0500 |
commit | c34c09a8451fac8555cbf0e8df1f6cf31cf1360b (patch) | |
tree | c02d5fc86654daa828f610a3d212f899ae6dee7d /scripts/checkpatch.pl | |
parent | 7e4915e78992ebd3cc031051dc23063bbf29e749 (diff) |
checkpatch: attempt to find missing switch/case break;
switch case statements missing a break statement are an unfortunately
common error.
e.g.:
commit 4a2c94c9b6c0 ("HID: kye: Add report fixup for Genius Manticore Keyboard")
case blocks should end in a break/return/goto/continue.
If a fall-through is used, it should have a comment showing that it is
intentional. Ideally that comment should be something like:
"/* fall-through */"
Add a test to look for missing break statements.
This looks only at the context lines before an inserted case so it's
possible to have false positives when the context contains a close brace
and the break is before the brace and not part of the patch context.
Looking at recent patches, this is a pretty rare occurrence. The normal
kernel style uses a break as the last line of the previous block.
Signed-off-by: Joe Perches <joe@perche.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts/checkpatch.pl')
-rwxr-xr-x | scripts/checkpatch.pl | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 9bb4a421a8d0..260b324b6c31 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -4128,6 +4128,31 @@ sub process { | |||
4128 | } | 4128 | } |
4129 | } | 4129 | } |
4130 | 4130 | ||
4131 | # check for case / default statements not preceeded by break/fallthrough/switch | ||
4132 | if ($line =~ /^.\s*(?:case\s+(?:$Ident|$Constant)\s*|default):/) { | ||
4133 | my $has_break = 0; | ||
4134 | my $has_statement = 0; | ||
4135 | my $count = 0; | ||
4136 | my $prevline = $linenr; | ||
4137 | while ($prevline > 1 && $count < 3 && !$has_break) { | ||
4138 | $prevline--; | ||
4139 | my $rline = $rawlines[$prevline - 1]; | ||
4140 | my $fline = $lines[$prevline - 1]; | ||
4141 | last if ($fline =~ /^\@\@/); | ||
4142 | next if ($fline =~ /^\-/); | ||
4143 | next if ($fline =~ /^.(?:\s*(?:case\s+(?:$Ident|$Constant)[\s$;]*|default):[\s$;]*)*$/); | ||
4144 | $has_break = 1 if ($rline =~ /fall[\s_-]*(through|thru)/i); | ||
4145 | next if ($fline =~ /^.[\s$;]*$/); | ||
4146 | $has_statement = 1; | ||
4147 | $count++; | ||
4148 | $has_break = 1 if ($fline =~ /\bswitch\b|\b(?:break\s*;[\s$;]*$|return\b|goto\b|continue\b)/); | ||
4149 | } | ||
4150 | if (!$has_break && $has_statement) { | ||
4151 | WARN("MISSING_BREAK", | ||
4152 | "Possible switch case/default not preceeded by break or fallthrough comment\n" . $herecurr); | ||
4153 | } | ||
4154 | } | ||
4155 | |||
4131 | # check for switch/default statements without a break; | 4156 | # check for switch/default statements without a break; |
4132 | if ($^V && $^V ge 5.10.0 && | 4157 | if ($^V && $^V ge 5.10.0 && |
4133 | defined $stat && | 4158 | defined $stat && |