libcdecl: Rework specifier output logic.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index d2359eb451187c0ea2068784b29fb66c445fb69a..0bc50232a496d2acef27299ba4ca8300475fccf1 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -22,7 +22,9 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
+#include "specstr.h"
+
+size_t cdecl__advance(char **buf, size_t *n, size_t amount)
 {
        if (amount >= *n) {
                *n   = 0;
@@ -35,35 +37,23 @@ size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
        return amount;
 }
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
-{
-       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);
-}
-
 size_t cdecl__emit(char **dst, size_t *dstlen, const char *src)
 {
        size_t rc = snprintf(*dst, *dstlen, "%s", src);
-       return cdecl__advance_(dst, dstlen, rc);
+       return cdecl__advance(dst, dstlen, rc);
 }
 
-#include "specstr.h"
-
-static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
+static size_t explain_spec(char **dst, size_t *dstlen, struct cdecl_declspec *s)
 {
-       const char *keyword = spec_string(s->type);
+       size_t ret;
+
+       ret = cdecl__emit(dst, dstlen, spec_string(s->type));
+       if (s->ident) {
+               ret += cdecl__emit(dst, dstlen, " " + !ret);
+               ret += cdecl__emit(dst, dstlen, s->ident);
+       }
 
-       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);
+       return ret;
 }
 
 /*
@@ -71,18 +61,19 @@ 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)
+size_t cdecl__emit_specs(char **dst, size_t *dstlen,
+                         struct cdecl_declspec *s,
+                         unsigned mask)
 {
-       size_t ret = 0, rc = 0;
+       size_t ret = 0;
 
        for (; s; s = s->next) {
                if (!(s->type & mask))
                        continue;
 
-               ret += cdecl__advance(&buf, &n, rc);
-               rc = explain_spec(buf, n, s);
+               ret += cdecl__emit(dst, dstlen, " " + !ret);
+               ret += explain_spec(dst, dstlen, s);
        }
 
-       return ret + rc;
+       return ret;
 }