Add note about old-style function declarations to the manual.

[cdecl99.git] / src / declare.c

diff --git a/src/declare.c b/src/declare.c
index bc8af4ad6c6b0afceab9495e441befefa996659b..bae96f351d370bbf0a3442d4579949bc4440692d 100644 (file)
--- a/src/declare.c
+++ b/src/declare.c
@@ -1,3 +1,21 @@
+/*
+ *  Render C declarations.
+ *  Copyright © 2011 Nick Bowler
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <config.h>
 #include <stdio.h>
 #include <assert.h>
 
@@ -65,7 +83,7 @@ static size_t declare_pointer(char *buf, size_t n, struct cdecl_pointer *p)
        else
                ret += cdecl__advance_(&buf, &n, rc);
 
-       rc = cdecl__explain_qualifiers(buf, n, p->qualifiers);
+       rc = cdecl__explain_specs(buf, n, p->qualifiers, CDECL_SPEC_QUAL);
        return ret + cdecl__advance(&buf, &n, rc);
 }
 
@@ -96,16 +114,15 @@ static size_t declare_function(char *buf, size_t n, struct cdecl_function *f)
                rc = declare_decl(buf, n, p);
                ret += cdecl__advance_(&buf, &n, rc);
 
+               rc = 0;
                if (p->next)
                        rc = snprintf(buf, n, ", ");
                else if (f->variadic)
-                       rc = snprintf(buf, n, ", ...)");
-               else
-                       rc = snprintf(buf, n, ")");
+                       rc = snprintf(buf, n, ", ...");
                ret += cdecl__advance_(&buf, &n, rc);
        }
 
-       return ret;
+       return ret + snprintf(buf, n, ")");
 }
 
 static size_t