patch-2.4.0-test3 linux/scripts/kernel-doc

Next file: linux/CREDITS
Previous file: linux/net/unix/af_unix.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/scripts/kernel-doc linux/scripts/kernel-doc
@@ -673,9 +673,9 @@
 	$args = $3;
 
 	# allow for up to fours args to function pointers
-	$args =~ s/(\([^\),]+),/\1#/;
-	$args =~ s/(\([^\),]+),/\1#/;
-	$args =~ s/(\([^\),]+),/\1#/;
+	$args =~ s/(\([^\),]+),/\1#/g;
+	$args =~ s/(\([^\),]+),/\1#/g;
+	$args =~ s/(\([^\),]+),/\1#/g;
 #	print STDERR "ARGS = '$args'\n";
 
 	foreach $arg (split ',', $args) {
@@ -691,6 +691,8 @@
 		$type = $arg;
 		$type =~ s/([^\(]+\(\*)$param/\1/;
 	    } else {
+		# evil magic to get fixed array parameters to work
+		$arg =~ s/(.+\s+)(.+)\[.*/\1* \2/;
 #		print STDERR "SCAN ARG: '$arg'\n";
 		@args = split('\s', $arg);
 
@@ -718,7 +720,7 @@
 	    }
             if ($parameters{$param} eq "") {
 	        $parameters{$param} = "-- undescribed --";
-	        print STDERR "Warning($lineno): Function parameter '$param' not described in '$function_name'\n";
+	        print STDERR "Warning($file:$lineno): Function parameter '$param' not described in '$function_name'\n";
 	    }
 
 	    push @parameterlist, $param;
@@ -780,6 +782,7 @@
 
 $lineno = 0;
 foreach $file (@ARGV) {
+    chomp($file);
     if (!open(IN,"<$file")) {
 	print STDERR "Error: Cannot open file $file\n";
 	next;


FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)