libcdecl: Simplify mixed type name error condition.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index a8d7ea5ade969fef29be01855623105106e57dfe..4590a5cfc60b2fb9c3d1bdead751da7d37b25d9b 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -22,42 +22,36 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
-{
-       if (amount >= *n) {
-               *n   = 0;
-               *buf = 0;
-       } else {
-               *buf += amount;
-               *n   -= amount;
-       }
+#include "specstr.h"
 
-       return amount;
-}
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-       size_t ret, rc;
+       size_t x = MIN(amount, dst->dstlen);
 
-       if (!amount)
-               return 0;
+       dst->dst    += x;
+       dst->dstlen -= x;
+       dst->accum  += amount;
 
-       ret = cdecl__advance_(buf, n, amount);
-       rc = snprintf(*buf, *n, " ");
-       return ret + cdecl__advance_(buf, n, rc);
+       return amount;
 }
 
-#include "specstr.h"
+size_t cdecl__emit(struct output_state *dst, const char *src)
+{
+       size_t rc = snprintf(dst->dst, dst->dstlen, "%s", src);
+       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,18 +59,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;
 
-               ret += cdecl__advance(&buf, &n, rc);
-               rc = explain_spec(buf, n, s);
+               cdecl__emit(dst, sep + empty);
+               explain_spec(dst, s);
+               empty = 0;
        }
 
-       return ret + rc;
+       return sep + empty;
 }