From 586ed929b831be5c46d06f7df93c5e49bcb374d2 Mon Sep 17 00:00:00 2001
From: Martin Waitz <tali@admingilde.org>
Date: Mon, 9 Jan 2006 20:53:55 -0800
Subject: [PATCH] --- yaml --- r: 17671 b: refs/heads/master c:
 a6d3fe77dace2c41a32b9699fe78960ab0908a97 h: refs/heads/master i:   17669:
 c214f1f7ff172c66dc39333858aae21539705a34   17667:
 373dda17e5f6deedc51d39ae6e2c4a36a5ed3705   17663:
 5ac8c4bbdbc0f3df03a5ca909dd83dfe84301b45 v: v3

---
 [refs]                   |  2 +-
 trunk/scripts/kernel-doc | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1fbd3bc0142b..1659a48de031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0863afb32b77fc89c7110b3d10fb048cb56bb1b5
+refs/heads/master: a6d3fe77dace2c41a32b9699fe78960ab0908a97
diff --git a/trunk/scripts/kernel-doc b/trunk/scripts/kernel-doc
index 2f45fd2969d0..9fd5f5b87d1e 100755
--- a/trunk/scripts/kernel-doc
+++ b/trunk/scripts/kernel-doc
@@ -1405,6 +1405,7 @@ sub create_parameterlist($$$) {
     my $type;
     my $param;
 
+    # temporarily replace commas inside function pointer definition
     while ($args =~ /(\([^\),]+),/) {
         $args =~ s/(\([^\),]+),/$1#/g;
     }
@@ -1465,11 +1466,10 @@ sub push_parameter($$$) {
 	my $param_name = $param;
 	$param_name =~ s/\[.*//;
 
-	if ($type eq "" && $param eq "...")
+	if ($type eq "" && $param =~ /\.\.\.$/)
 	{
 	    $type="";
-	    $param="...";
-	    $parameterdescs{"..."} = "variable arguments";
+	    $parameterdescs{$param} = "variable arguments";
 	}
 	elsif ($type eq "" && ($param eq "" or $param eq "void"))
 	{
@@ -1477,7 +1477,11 @@ sub push_parameter($$$) {
 	    $param="void";
 	    $parameterdescs{void} = "no arguments";
 	}
-	if (defined $type && $type && !defined $parameterdescs{$param_name}) {
+	# warn if parameter has no description
+	# (but ignore ones starting with # as these are no parameters
+	# but inline preprocessor statements
+	if (!defined $parameterdescs{$param_name} && $param_name !~ /^#/) {
+
 	    $parameterdescs{$param_name} = $undescribed;
 
 	    if (($type eq 'function') || ($type eq 'enum')) {