diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /scripts/kernel-doc | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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; |