diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /scripts/kernel-doc | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 26146cbaa504..74c2f9db2aac 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1512,13 +1512,13 @@ sub create_parameterlist($$$) { | |||
| 1512 | # corresponding data structures "correctly". Catch it later in | 1512 | # corresponding data structures "correctly". Catch it later in |
| 1513 | # output_* subs. | 1513 | # output_* subs. |
| 1514 | push_parameter($arg, "", $file); | 1514 | push_parameter($arg, "", $file); |
| 1515 | } elsif ($arg =~ m/\(.*\*/) { | 1515 | } elsif ($arg =~ m/\(.+\)\s*\(/) { |
| 1516 | # pointer-to-function | 1516 | # pointer-to-function |
| 1517 | $arg =~ tr/#/,/; | 1517 | $arg =~ tr/#/,/; |
| 1518 | $arg =~ m/[^\(]+\(\*\s*([^\)]+)\)/; | 1518 | $arg =~ m/[^\(]+\(\*?\s*(\w*)\s*\)/; |
| 1519 | $param = $1; | 1519 | $param = $1; |
| 1520 | $type = $arg; | 1520 | $type = $arg; |
| 1521 | $type =~ s/([^\(]+\(\*)$param/$1/; | 1521 | $type =~ s/([^\(]+\(\*?)\s*$param/$1/; |
| 1522 | push_parameter($param, $type, $file); | 1522 | push_parameter($param, $type, $file); |
| 1523 | } elsif ($arg) { | 1523 | } elsif ($arg) { |
| 1524 | $arg =~ s/\s*:\s*/:/g; | 1524 | $arg =~ s/\s*:\s*/:/g; |