diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:19 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:19 -0500 |
commit | b8307db2477f9c551e54e0c7b643ea349a3349cd (patch) | |
tree | 88654f8bd73857bbd40f75013ce41d8882d16ce6 /scripts | |
parent | f0461d0146ee30927bc7efa2ae24ea8c6693b725 (diff) | |
parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) |
Merge commit 'v2.6.28-rc7' into tracing/core
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/kernel-doc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index a53e2fc8dfb5..d27aad78e1d8 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
@@ -378,6 +378,10 @@ sub dump_section { | |||
378 | # print STDERR "parameter def '$1' = '$contents'\n"; | 378 | # print STDERR "parameter def '$1' = '$contents'\n"; |
379 | $name = $1; | 379 | $name = $1; |
380 | $parameterdescs{$name} = $contents; | 380 | $parameterdescs{$name} = $contents; |
381 | } elsif ($name eq "@\.\.\.") { | ||
382 | # print STDERR "parameter def '...' = '$contents'\n"; | ||
383 | $name = "..."; | ||
384 | $parameterdescs{$name} = $contents; | ||
381 | } else { | 385 | } else { |
382 | # print STDERR "other section '$name' = '$contents'\n"; | 386 | # print STDERR "other section '$name' = '$contents'\n"; |
383 | if (defined($sections{$name}) && ($sections{$name} ne "")) { | 387 | if (defined($sections{$name}) && ($sections{$name} ne "")) { |
@@ -1588,12 +1592,12 @@ sub push_parameter($$$) { | |||
1588 | 1592 | ||
1589 | if ($type eq "" && $param =~ /\.\.\.$/) | 1593 | if ($type eq "" && $param =~ /\.\.\.$/) |
1590 | { | 1594 | { |
1591 | $type=""; | 1595 | if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") { |
1592 | $parameterdescs{$param} = "variable arguments"; | 1596 | $parameterdescs{$param} = "variable arguments"; |
1597 | } | ||
1593 | } | 1598 | } |
1594 | elsif ($type eq "" && ($param eq "" or $param eq "void")) | 1599 | elsif ($type eq "" && ($param eq "" or $param eq "void")) |
1595 | { | 1600 | { |
1596 | $type=""; | ||
1597 | $param="void"; | 1601 | $param="void"; |
1598 | $parameterdescs{void} = "no arguments"; | 1602 | $parameterdescs{void} = "no arguments"; |
1599 | } | 1603 | } |