Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54556
b: refs/heads/master
c: 3c30879
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed May 8, 2007
1 parent dc3007a commit 223d054
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2d3466a348a61c4d7f958ce80020eba17c09d7f7
refs/heads/master: 3c308798a337d75d846773dd64155860852931fc
96 changes: 48 additions & 48 deletions trunk/scripts/kernel-doc
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,10 @@ sub output_highlight {
eval $dohighlight;
die $@ if $@;
foreach $line (split "\n", $contents) {
if ($line eq ""){
if ($line eq ""){
print $lineprefix, $blankline;
} else {
$line =~ s/\\\\\\/\&/g;
$line =~ s/\\\\\\/\&/g;
print $lineprefix, $line;
}
print "\n";
Expand Down Expand Up @@ -414,7 +414,7 @@ sub output_enum_html(%) {
print "<b>enum ".$args{'enum'}."</b> {<br>\n";
$count = 0;
foreach $parameter (@{$args{'parameterlist'}}) {
print " <b>".$parameter."</b>";
print " <b>".$parameter."</b>";
if ($count != $#{$args{'parameterlist'}}) {
$count++;
print ",\n";
Expand Down Expand Up @@ -462,7 +462,7 @@ sub output_struct_html(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
$type = $args{'parametertypes'}{$parameter};
if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
# pointer-to-function
Expand All @@ -483,7 +483,7 @@ sub output_struct_html(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
print "<dt><b>".$parameter."</b>\n";
print "<dd>";
output_highlight($args{'parameterdescs'}{$parameter_name});
Expand Down Expand Up @@ -525,7 +525,7 @@ sub output_function_html(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
print "<dt><b>".$parameter."</b>\n";
print "<dd>";
output_highlight($args{'parameterdescs'}{$parameter_name});
Expand Down Expand Up @@ -691,7 +691,7 @@ sub output_struct_xml(%) {
$parameter_name =~ s/\[.*//;

defined($args{'parameterdescs'}{$parameter_name}) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
$type = $args{'parametertypes'}{$parameter};
if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
# pointer-to-function
Expand Down Expand Up @@ -767,11 +767,11 @@ sub output_enum_xml(%) {
print "enum ".$args{'enum'}." {\n";
$count = 0;
foreach $parameter (@{$args{'parameterlist'}}) {
print " $parameter";
if ($count != $#{$args{'parameterlist'}}) {
print " $parameter";
if ($count != $#{$args{'parameterlist'}}) {
$count++;
print ",";
}
}
print "\n";
}
print "};";
Expand Down Expand Up @@ -1007,7 +1007,7 @@ sub output_enum_man(%) {
print "enum ".$args{'enum'}." {\n";
$count = 0;
foreach my $parameter (@{$args{'parameterlist'}}) {
print ".br\n.BI \" $parameter\"\n";
print ".br\n.BI \" $parameter\"\n";
if ($count == $#{$args{'parameterlist'}}) {
print "\n};\n";
last;
Expand Down Expand Up @@ -1054,7 +1054,7 @@ sub output_struct_man(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
$type = $args{'parametertypes'}{$parameter};
if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
# pointer-to-function
Expand All @@ -1077,7 +1077,7 @@ sub output_struct_man(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
print ".IP \"".$parameter."\" 12\n";
output_highlight($args{'parameterdescs'}{$parameter_name});
}
Expand Down Expand Up @@ -1187,7 +1187,7 @@ sub output_enum_text(%) {
print "enum ".$args{'enum'}." {\n";
$count = 0;
foreach $parameter (@{$args{'parameterlist'}}) {
print "\t$parameter";
print "\t$parameter";
if ($count != $#{$args{'parameterlist'}}) {
$count++;
print ",";
Expand Down Expand Up @@ -1232,7 +1232,7 @@ sub output_struct_text(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
$type = $args{'parametertypes'}{$parameter};
if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
# pointer-to-function
Expand All @@ -1252,7 +1252,7 @@ sub output_struct_text(%) {
my $parameter_name = $parameter;
$parameter_name =~ s/\[.*//;

($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
print "$parameter\n\t";
print $args{'parameterdescs'}{$parameter_name}."\n";
}
Expand Down Expand Up @@ -1284,7 +1284,7 @@ sub output_declaration {
( $function_only == 1 && defined($function_table{$name})) ||
( $function_only == 2 && !defined($function_table{$name})))
{
&$func(@_);
&$func(@_);
$section_counter++;
}
}
Expand Down Expand Up @@ -1317,8 +1317,8 @@ sub dump_struct($$) {
my $file = shift;

if ($x =~/(struct|union)\s+(\w+)\s*{(.*)}/) {
$declaration_name = $2;
my $members = $3;
$declaration_name = $2;
my $members = $3;

# ignore embedded structs or unions
$members =~ s/{.*?}//g;
Expand All @@ -1345,7 +1345,7 @@ sub dump_struct($$) {
});
}
else {
print STDERR "Error(${file}:$.): Cannot parse struct or union!\n";
print STDERR "Error(${file}:$.): Cannot parse struct or union!\n";
++$errors;
}
}
Expand All @@ -1356,15 +1356,15 @@ sub dump_enum($$) {

$x =~ s@/\*.*?\*/@@gos; # strip comments.
if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
$declaration_name = $1;
my $members = $2;
$declaration_name = $1;
my $members = $2;

foreach my $arg (split ',', $members) {
$arg =~ s/^\s*(\w+).*/$1/;
push @parameterlist, $arg;
if (!$parameterdescs{$arg}) {
$parameterdescs{$arg} = $undescribed;
print STDERR "Warning(${file}:$.): Enum value '$arg' ".
$parameterdescs{$arg} = $undescribed;
print STDERR "Warning(${file}:$.): Enum value '$arg' ".
"not described in enum '$declaration_name'\n";
}

Expand All @@ -1382,7 +1382,7 @@ sub dump_enum($$) {
});
}
else {
print STDERR "Error(${file}:$.): Cannot parse enum!\n";
print STDERR "Error(${file}:$.): Cannot parse enum!\n";
++$errors;
}
}
Expand All @@ -1393,12 +1393,12 @@ sub dump_typedef($$) {

$x =~ s@/\*.*?\*/@@gos; # strip comments.
while (($x =~ /\(*.\)\s*;$/) || ($x =~ /\[*.\]\s*;$/)) {
$x =~ s/\(*.\)\s*;$/;/;
$x =~ s/\(*.\)\s*;$/;/;
$x =~ s/\[*.\]\s*;$/;/;
}

if ($x =~ /typedef.*\s+(\w+)\s*;/) {
$declaration_name = $1;
$declaration_name = $1;

output_declaration($declaration_name,
'typedef',
Expand All @@ -1410,7 +1410,7 @@ sub dump_typedef($$) {
});
}
else {
print STDERR "Error(${file}:$.): Cannot parse typedef!\n";
print STDERR "Error(${file}:$.): Cannot parse typedef!\n";
++$errors;
}
}
Expand All @@ -1424,14 +1424,14 @@ sub create_parameterlist($$$) {

# temporarily replace commas inside function pointer definition
while ($args =~ /(\([^\),]+),/) {
$args =~ s/(\([^\),]+),/$1#/g;
$args =~ s/(\([^\),]+),/$1#/g;
}

foreach my $arg (split($splitter, $args)) {
# strip comments
$arg =~ s/\/\*.*\*\///;
# strip leading/trailing spaces
$arg =~ s/^\s*//;
# strip leading/trailing spaces
$arg =~ s/^\s*//;
$arg =~ s/\s*$//;
$arg =~ s/\s+/ /;

Expand Down Expand Up @@ -1514,15 +1514,15 @@ sub push_parameter($$$) {
$parameterdescs{$param_name} = $undescribed;

if (($type eq 'function') || ($type eq 'enum')) {
print STDERR "Warning(${file}:$.): Function parameter ".
print STDERR "Warning(${file}:$.): Function parameter ".
"or member '$param' not " .
"described in '$declaration_name'\n";
}
print STDERR "Warning(${file}:$.):".
" No description found for parameter '$param'\n";
" No description found for parameter '$param'\n";
++$warnings;
}
}
}
}

push @parameterlist, $param;
$parametertypes{$param} = $type;
Expand Down Expand Up @@ -1664,10 +1664,10 @@ sub process_state3_function($$) {
# do nothing
}
elsif ($x =~ /([^\{]*)/) {
$prototype .= $1;
$prototype .= $1;
}
if (($x =~ /\{/) || ($x =~ /\#define/) || ($x =~ /;/)) {
$prototype =~ s@/\*.*?\*/@@gos; # strip comments.
$prototype =~ s@/\*.*?\*/@@gos; # strip comments.
$prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
$prototype =~ s@^\s+@@gos; # strip leading spaces
dump_function($prototype,$file);
Expand All @@ -1688,17 +1688,17 @@ sub process_state3_type($$) {
}

while (1) {
if ( $x =~ /([^{};]*)([{};])(.*)/ ) {
if ( $x =~ /([^{};]*)([{};])(.*)/ ) {
$prototype .= $1 . $2;
($2 eq '{') && $brcount++;
($2 eq '}') && $brcount--;
if (($2 eq ';') && ($brcount == 0)) {
dump_declaration($prototype,$file);
dump_declaration($prototype,$file);
reset_state();
last;
last;
}
$x = $3;
} else {
} else {
$prototype .= $x;
last;
}
Expand Down Expand Up @@ -1756,7 +1756,7 @@ sub process_file($) {
} else {
$section = $1;
}
}
}
elsif (/$doc_decl/o) {
$identifier = $1;
if (/\s*([\w\s]+?)\s*-/) {
Expand Down Expand Up @@ -1849,13 +1849,13 @@ sub process_file($) {
}
} elsif ($state == 3) { # scanning for function '{' (end of prototype)
if ($decl_type eq 'function') {
process_state3_function($_, $file);
process_state3_function($_, $file);
} else {
process_state3_type($_, $file);
process_state3_type($_, $file);
}
} elsif ($state == 4) {
# Documentation block
if (/$doc_block/) {
if (/$doc_block/) {
dump_section($section, $contents);
output_intro({'sectionlist' => \@sectionlist,
'sections' => \%sections });
Expand All @@ -1873,7 +1873,7 @@ sub process_file($) {
} else {
$section = $1;
}
}
}
elsif (/$doc_end/)
{
dump_section($section, $contents);
Expand All @@ -1900,8 +1900,8 @@ sub process_file($) {
{
$contents .= $1 . "\n";
}
}
}
}
}
}
if ($initial_section_counter == $section_counter) {
print STDERR "Warning(${file}): no structured comments found\n";
Expand Down

0 comments on commit 223d054

Please sign in to comment.