aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRusty Russell <trivial@rustcorp.com.au>2004-07-10 19:32:15 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-10 19:32:15 -0700
commit2e15f5401a0c7ae210233bdecb9c59ecfeb4e9e6 (patch)
tree62a2b9aaae4bf4ab724c1573d847324857d4a36f /scripts
parentc1a202452dd3b8c1e10c1235da81b1248fb038e9 (diff)
downloadhistory-2e15f5401a0c7ae210233bdecb9c59ecfeb4e9e6.tar.gz
[PATCH] trivial: scripts_kernel-doc: ignoring embedded structs shouldn't be
From: <adobriyan@mail.ru> Imagine you have a code similar to struct foo { union { struct tcphdr *th; } h; union { struct iphdr *iph; } nh; }; kernel-doc in it's current state will happily eat everything from first '{' to last '}' and nobody will see parameter 'h' in documentation (look at include/linux/skbuff.h:struct sk_buff for real world example). So, fix the greedy regexp. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kernel-doc2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index a331dfdb209f25..a8ec38b3903c3f 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1206,7 +1206,7 @@ sub dump_struct($$) {
my $members = $3;
# ignore embedded structs or unions
- $members =~ s/{.*}//g;
+ $members =~ s/{.*?}//g;
create_parameterlist($members, ';', $file);