X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/8e320b09c58bbf947dbdc5e0019bdaad478591fe..21bc2db0ec83b235caec38d42f4d0812f473d766:/src/output.c

diff --git a/src/output.c b/src/output.c
index f52661d..7206eb9 100644
--- a/src/output.c
+++ b/src/output.c
@@ -22,42 +22,44 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
+#include "parse.h"
+#include "specstr.h"
+
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-	if (amount >= *n) {
-		*n   = 0;
-		*buf = 0;
-	} else {
-		*buf += amount;
-		*n   -= amount;
-	}
+	size_t x = MIN(amount, dst->dstlen);
+
+	dst->dst    += x;
+	dst->dstlen -= x;
+	dst->accum  += amount;
 
 	return amount;
 }
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
 {
-	size_t ret, rc;
-
-	if (!amount)
-		return 0;
-
-	ret = cdecl__advance_(buf, n, amount);
-	rc = snprintf(*buf, *n, " ");
-	return ret + cdecl__advance_(buf, n, rc);
+	if (dst)
+		snprintf(dst, dstlen, "%s", src);
+	return strlen(src);
 }
 
-#include "specstr.h"
+size_t cdecl__emit(struct output_state *dst, const char *src)
+{
+	size_t rc = cdecl__strlcpy(dst->dst, src, dst->dstlen);
+	return cdecl__advance(dst, rc);
+}
 
-static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
+static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
-	const char *keyword = spec_string(s->type);
+	size_t rc;
 
-	if (keyword[0] && s->ident)
-		return snprintf(buf, n, "%s %s", keyword, s->ident);
-	else if (s->ident)
-		return snprintf(buf, n, "%s", s->ident);
-	return snprintf(buf, n, "%s", keyword);
+	rc = cdecl__emit(dst, spec_string(s->type));
+	if (s->ident) {
+		cdecl__emit(dst, " " + !rc);
+		cdecl__emit(dst, s->ident);
+	}
 }
 
 /*
@@ -65,21 +67,21 @@ static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__explain_specs(char *buf, size_t n, struct cdecl_declspec *s,
-                                                 unsigned mask)
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask)
 {
-	size_t ret = 0, rc = 0;
+	const char *sep = " ";
+	int empty = 1;
+
+	for (; s; s = s->next) {
+		if (!(s->type & mask))
+			continue;
 
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		switch (cdecl_spec_kind(c) & mask) {
-		case CDECL_SPEC_FUNC:
-		case CDECL_SPEC_STOR:
-		case CDECL_SPEC_QUAL:
-		case CDECL_SPEC_TYPE:
-			ret += cdecl__advance(&buf, &n, rc);
-			rc = explain_spec(buf, n, c);
-		}
+		cdecl__emit(dst, sep + empty);
+		explain_spec(dst, s);
+		empty = 0;
 	}
 
-	return ret + rc;
+	return sep + empty;
 }