summaryrefslogtreecommitdiffstats
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-08-05 22:01:32 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-05 23:33:49 +0200
commit32ab8f97dd95592b17e684f7722caa0556087b99 (patch)
treecf6393627f7a2ef9d7f8d6844ddca0afb59aa68a /scripts/kernel-doc
parentdma: fix order calculation in dma_mark_declared_memory_occupied() (diff)
downloadlinux-32ab8f97dd95592b17e684f7722caa0556087b99.tar.xz
linux-32ab8f97dd95592b17e684f7722caa0556087b99.zip
kernel-doc: skip nested struct/union cleanly
Fix handling of nested structs or unions. The regex to strip (eliminate) nested structs or unions was limited to only 0 or 1 matches. This can cause an uneven number of left/right braces to be stripped, which causes this: Warning(linux-2.6.27-rc1-git2//include/net/mac80211.h:336): No description found for parameter '}' 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>
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index d8f77e26081c..ff787e6ff8ed 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1403,7 +1403,7 @@ sub dump_struct($$) {
my $members = $3;
# ignore embedded structs or unions
- $members =~ s/{.*?}//g;
+ $members =~ s/{.*}//g;
# ignore members marked private:
$members =~ s/\/\*.*?private:.*?public:.*?\*\///gos;