summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-02-10 01:45:56 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:32 -0800
commit996a07bcb62c5935248e238a1150089f3d99a6fb (patch)
treedaad83697a9b15b2a426d90623383e7ebe3023b2
parent78831ba68263d37382d61ea87d738975d992bd0d (diff)
downloadlinux-stable-996a07bcb62c5935248e238a1150089f3d99a6fb.tar.gz
linux-stable-996a07bcb62c5935248e238a1150089f3d99a6fb.tar.bz2
linux-stable-996a07bcb62c5935248e238a1150089f3d99a6fb.zip
[PATCH] kernel-doc: allow more whitespace
Allow whitespace in pointer-to-function [accept "(* done)", not just "(*done)"]. Allow tabs (spaces are already allowed) between "#define" and a macro name. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/kernel-doc4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 35d7fd9a1e65..cc63cd01d5ee 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1433,7 +1433,7 @@ sub create_parameterlist($$$) {
} elsif ($arg =~ m/\(.*\*/) {
# pointer-to-function
$arg =~ tr/#/,/;
- $arg =~ m/[^\(]+\(\*([^\)]+)\)/;
+ $arg =~ m/[^\(]+\(\*\s*([^\)]+)\)/;
$param = $1;
$type = $arg;
$type =~ s/([^\(]+\(\*)$param/$1/;
@@ -1536,7 +1536,7 @@ sub dump_function($$) {
$prototype =~ s/^__always_inline +//;
$prototype =~ s/^noinline +//;
$prototype =~ s/__devinit +//;
- $prototype =~ s/^#define +//; #ak added
+ $prototype =~ s/^#define\s+//; #ak added
$prototype =~ s/__attribute__ \(\([a-z,]*\)\)//;
# Yes, this truly is vile. We are looking for: