From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 5 Aug 2008 20:01:32 +0000 (-0700)
Subject: kernel-doc: skip nested struct/union cleanly
X-Git-Tag: v2.6.27-rc2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=32ab8f97dd95592b17e684f7722caa0556087b99;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index d8f77e26081..ff787e6ff8e 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;