X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/42f53d5e9ac7a02c1b899b0786194611eae56a56..7ec517ce4d3b660e64133c2e67ef7686daec74e2:/src/declare.c

diff --git a/src/declare.c b/src/declare.c
index 8f7d607..318ccac 100644
--- a/src/declare.c
+++ b/src/declare.c
@@ -30,13 +30,11 @@ declare_declarator(char **dst, size_t *dstlen, struct cdecl_declarator *d);
 
 static size_t declare_decl(char **dst, size_t *dstlen, struct cdecl *decl)
 {
-	size_t ret, rc;
+	size_t ret;
 
-	rc = cdecl__explain_specs(*dst, *dstlen, decl->specifiers, -1);
+	ret = cdecl__emit_specs(dst, dstlen, decl->specifiers, -1);
 	if (decl->declarators->type != CDECL_DECL_NULL)
-		ret = cdecl__advance(dst, dstlen, rc);
-	else
-		ret = cdecl__advance_(dst, dstlen, rc);
+		ret += cdecl__emit(dst, dstlen, " ");
 
 	return ret + declare_declarator(dst, dstlen, decl->declarators);
 }
@@ -63,11 +61,11 @@ declare_pointer(char **dst, size_t *dstlen, struct cdecl_pointer *p)
 	struct cdecl_declspec *q = p->qualifiers;
 
 	if (q) {
-		size_t ret, rc;
+		size_t ret;
 
 		ret  = cdecl__emit(dst, dstlen, "* ");
-		rc   = cdecl__explain_specs(*dst, *dstlen, q, -1);
-		return ret + cdecl__advance(dst, dstlen, rc);
+		ret += cdecl__emit_specs(dst, dstlen, q, -1);
+		return ret + cdecl__emit(dst, dstlen, " ");
 	}
 
 	return cdecl__emit(dst, dstlen, "*");
@@ -84,7 +82,7 @@ static size_t declare_array(char **dst, size_t *dstlen, struct cdecl_array *a)
 		ret += cdecl__emit(dst, dstlen, s);
 	} else {
 		size_t rc = snprintf(*dst, *dstlen, "%.0" PRIuMAX, a->length);
-		ret += cdecl__advance_(dst, dstlen, rc);
+		ret += cdecl__advance(dst, dstlen, rc);
 	}
 
 	return ret + cdecl__emit(dst, dstlen, "]");