diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-08-05 16:01:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 17:33:49 -0400 |
commit | 32ab8f97dd95592b17e684f7722caa0556087b99 (patch) | |
tree | cf6393627f7a2ef9d7f8d6844ddca0afb59aa68a | |
parent | d2dc1f4adb4b5b02d87e49e115e5107f4da790c0 (diff) |
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>
-rwxr-xr-x | scripts/kernel-doc | 2 |
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($$) { | |||
1403 | my $members = $3; | 1403 | my $members = $3; |
1404 | 1404 | ||
1405 | # ignore embedded structs or unions | 1405 | # ignore embedded structs or unions |
1406 | $members =~ s/{.*?}//g; | 1406 | $members =~ s/{.*}//g; |
1407 | 1407 | ||
1408 | # ignore members marked private: | 1408 | # ignore members marked private: |
1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; | 1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; |