X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fkernel-doc;h=aa7ffee63b45072f7272917c3905768cebfc85d0;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=945a28bdedbd70cde414e1daeac573383ac514f7;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 945a28bde..aa7ffee63 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -652,7 +652,7 @@ sub output_struct_sgml(%) {
 	$type = $args{'parametertypes'}{$parameter};
 	if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
 	    # pointer-to-function
-	    print "  $1 $parameter ($2);\n";
+	    print "  $1 $parameter) ($2);\n";
 	} elsif ($type =~ m/^(.*?)\s*(:.*)/) {
 	    print "  $1 $parameter$2;\n";
 	} else {
@@ -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);
 
@@ -1304,6 +1304,8 @@ sub create_parameterlist($$$) {
     }
     
     foreach my $arg (split($splitter, $args)) {
+	# strip comments
+	$arg =~ s/\/\*.*\*\///;
         # strip leading/trailing spaces
         $arg =~ s/^\s*//;
 	$arg =~ s/\s*$//;