|
@@ -1003,7 +1003,6 @@ sub dump_union($$) {
|
|
|
sub dump_struct($$) {
|
|
|
my $x = shift;
|
|
|
my $file = shift;
|
|
|
- my $nested;
|
|
|
|
|
|
if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
|
|
|
my $decl_type = $1;
|
|
@@ -1063,11 +1062,9 @@ sub dump_struct($$) {
|
|
|
|
|
|
# Ignore other nested elements, like enums
|
|
|
$members =~ s/({[^\{\}]*})//g;
|
|
|
- $nested = $decl_type;
|
|
|
- $nested =~ s/\/\*.*?\*\///gos;
|
|
|
|
|
|
create_parameterlist($members, ';', $file);
|
|
|
- check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual, $nested);
|
|
|
+ check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual);
|
|
|
|
|
|
# Adjust declaration for better display
|
|
|
$declaration =~ s/([{;])/$1\n/g;
|
|
@@ -1372,8 +1369,8 @@ sub push_parameter($$$) {
|
|
|
$parametertypes{$param} = $type;
|
|
|
}
|
|
|
|
|
|
-sub check_sections($$$$$$) {
|
|
|
- my ($file, $decl_name, $decl_type, $sectcheck, $prmscheck, $nested) = @_;
|
|
|
+sub check_sections($$$$$) {
|
|
|
+ my ($file, $decl_name, $decl_type, $sectcheck, $prmscheck) = @_;
|
|
|
my @sects = split ' ', $sectcheck;
|
|
|
my @prms = split ' ', $prmscheck;
|
|
|
my $err;
|
|
@@ -1407,14 +1404,6 @@ sub check_sections($$$$$$) {
|
|
|
"'$sects[$sx]' " .
|
|
|
"description in '$decl_name'\n";
|
|
|
++$warnings;
|
|
|
- } else {
|
|
|
- if ($nested !~ m/\Q$sects[$sx]\E/) {
|
|
|
- print STDERR "${file}:$.: warning: " .
|
|
|
- "Excess $decl_type member " .
|
|
|
- "'$sects[$sx]' " .
|
|
|
- "description in '$decl_name'\n";
|
|
|
- ++$warnings;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1525,7 +1514,7 @@ sub dump_function($$) {
|
|
|
}
|
|
|
|
|
|
my $prms = join " ", @parameterlist;
|
|
|
- check_sections($file, $declaration_name, "function", $sectcheck, $prms, "");
|
|
|
+ check_sections($file, $declaration_name, "function", $sectcheck, $prms);
|
|
|
|
|
|
# This check emits a lot of warnings at the moment, because many
|
|
|
# functions don't have a 'Return' doc section. So until the number
|