X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/8c4c37ecd2f04402c23b18c2e0a25f7bcc5bdce3..ed00362ec1f6f385d03ea5ca2b3dc3a8c25f4426:/src/declare.c

diff --git a/src/declare.c b/src/declare.c
index bc8af4a..d5af714 100644
--- a/src/declare.c
+++ b/src/declare.c
@@ -1,4 +1,23 @@
+/*
+ *  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 <stdbool.h>
 #include <assert.h>
 
 #include "cdecl.h"
@@ -65,8 +84,18 @@ 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);
-	return ret + cdecl__advance(&buf, &n, rc);
+	rc = cdecl__explain_specs(buf, n, p->qualifiers, CDECL_SPEC_QUAL);
+	return ret + rc;
+}
+
+static bool pointer_needs_space(struct cdecl_declarator *d)
+{
+	assert(d->type == CDECL_DECL_POINTER);
+
+	if (d->u.pointer.qualifiers)
+		return d->child->type != CDECL_DECL_NULL;
+
+	return false;
 }
 
 static size_t declare_array(char *buf, size_t n, struct cdecl_array *a)
@@ -96,16 +125,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
@@ -123,7 +151,10 @@ declare_declarator(char *buf, size_t n, struct cdecl_declarator *d)
 			break;
 		case CDECL_DECL_POINTER:
 			rc = declare_pointer(buf, n, &d->u.pointer);
-			ret += cdecl__advance_(&buf, &n, rc);
+			if (pointer_needs_space(d))
+				ret += cdecl__advance(&buf, &n, rc);
+			else
+				ret += cdecl__advance_(&buf, &n, rc);
 			break;
 		/*
 		 * Arrays and functions are special: since they are postfix,