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

diff --git a/src/declare.c b/src/declare.c
index 87efc3b..d5af714 100644
--- a/src/declare.c
+++ b/src/declare.c
@@ -17,6 +17,7 @@
  */
 #include <config.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <assert.h>
 
 #include "cdecl.h"
@@ -83,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)
@@ -140,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,