From 7877aa51f701e4e4669fd9f6f5b725901ab1509b Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Mon, 18 Apr 2011 22:08:34 -0400
Subject: [PATCH] mkdb+common: use '...' for varargs more consistently

Fixes non-sense warnings about missing+unused parameters.
---
 gtkdoc-common.pl.in | 2 +-
 gtkdoc-mkdb.in      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in
index 4807e91..536f16e 100644
--- a/gtkdoc-common.pl.in
+++ b/gtkdoc-common.pl.in
@@ -354,7 +354,7 @@ sub ParseFunctionDeclaration {
             push @result, $label;
 
         } elsif ($declaration =~ s/^...\s*[,\n]//) {
-            push @result, "Varargs";
+            push @result, "...";
             my $label = defined $namefunc ? $namefunc->("...") : "...";
             push @result, $label;
 
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 148745e..e114263 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -2125,6 +2125,9 @@ sub OutputParamDescriptions {
             } elsif ($param_name eq "void") {
                 #print "!!!! void in params for $symbol?\n";
             } else {
+                if ($param_name eq "Varargs") {
+                    $param_name = "...";
+                }
                 if (@fields) {
                     if (!defined $field_descrs{$param_name}) {
                         &LogWarning (&GetSymbolSourceFile ($symbol), &GetSymbolSourceLine($symbol),
@@ -2138,9 +2141,6 @@ sub OutputParamDescriptions {
                         delete $field_descrs{$param_name};
                     }
                 }
-                if ($param_name eq "Varargs") {
-                    $param_name = "...";
-                }
                 if($param_desc ne "") {
                     $params_desc .= "<varlistentry><term><parameter>$param_name</parameter>&#160;:</term>\n<listitem><simpara>$param_desc</simpara></listitem></varlistentry>\n";
                     $num_params++;
-- 
2.11.4.GIT