summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSilvio Fricke <silvio.fricke@gmail.com>2016-10-28 10:14:08 +0200
committerJonathan Corbet <corbet@lwn.net>2016-10-28 18:54:16 +0200
commitc950a1739eaef2ab64372fc35af7301fcef2c9a7 (patch)
treea4d51dccf50f932587fbd626a35b444415b83fcc /scripts
parentMerge branch 'doc-tweaks' into docs-next (diff)
downloadlinux-c950a1739eaef2ab64372fc35af7301fcef2c9a7.tar.xz
linux-c950a1739eaef2ab64372fc35af7301fcef2c9a7.zip
kernel-doc: better parsing of named variable arguments
Without this patch we get warnings for named variable arguments. warning: No description found for parameter '...' warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue' Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kernel-doc8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 93721f3c91bf..e10378f769f9 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -204,6 +204,7 @@ EOF
## init lots of data
+
my $errors = 0;
my $warnings = 0;
my $anon_struct_union = 0;
@@ -211,7 +212,7 @@ my $anon_struct_union = 0;
# match expressions used to find embedded type information
my $type_constant = '\%([-_\w]+)';
my $type_func = '(\w+)\(\)';
-my $type_param = '\@(\w+)';
+my $type_param = '\@(\w+(\.\.\.)?)';
my $type_fp_param = '\@(\w+)\(\)'; # Special RST handling for func ptr params
my $type_struct = '\&((struct\s*)*[_\w]+)';
my $type_struct_xml = '\\&amp;((struct\s*)*[_\w]+)';
@@ -2353,7 +2354,10 @@ sub push_parameter($$$) {
if ($type eq "" && $param =~ /\.\.\.$/)
{
- $param = "...";
+ if (!$param =~ /\w\.\.\.$/) {
+ # handles unnamed variable parameters
+ $param = "...";
+ }
if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") {
$parameterdescs{$param} = "variable arguments";
}