Commit 0776e594 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds

checkpatch: do is not a possible type

A do without braces '{' may trigger a false possible type 'do' and then
this may be interpreted as an external definition of foo():

	do
		foo();
	while (bar);

Add do to the type exclusions.  Fix up tests so we can check for them.
Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5fdd23ac
...@@ -913,12 +913,22 @@ sub annotate_values { ...@@ -913,12 +913,22 @@ sub annotate_values {
sub possible { sub possible {
my ($possible, $line) = @_; my ($possible, $line) = @_;
print "CHECK<$possible> ($line)\n" if ($dbg_possible > 1); print "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
if ($possible !~ /^(?:$Modifier|$Storage|$Type|DEFINE_\S+)$/ && if ($possible !~ /(?:
$possible ne 'goto' && $possible ne 'return' && ^(?:
$possible ne 'case' && $possible ne 'else' && $Modifier|
$possible ne 'asm' && $possible ne '__asm__' && $Storage|
$possible !~ /^(typedef|struct|enum)\b/) { $Type|
DEFINE_\S+|
goto|
return|
case|
else|
asm|__asm__|
do
)$|
^(?:typedef|struct|enum)\b
)/x) {
# Check for modifiers. # Check for modifiers.
$possible =~ s/\s*$Storage\s*//g; $possible =~ s/\s*$Storage\s*//g;
$possible =~ s/\s*$Sparse\s*//g; $possible =~ s/\s*$Sparse\s*//g;
...@@ -936,6 +946,8 @@ sub possible { ...@@ -936,6 +946,8 @@ sub possible {
push(@typeList, $possible); push(@typeList, $possible);
} }
build_types(); build_types();
} else {
warn "NOTPOSS: $possible ($line)\n" if ($dbg_possible > 1);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment