libcdecl: Use a structure for dst/dstlen in output routines.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 0bc50232a496d2acef27299ba4ca8300475fccf1..27921abb70b9bd6339cfc510af25dec46d826a5b 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -24,33 +24,33 @@
 
 #include "specstr.h"
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-       if (amount >= *n) {
-               *n   = 0;
-               *buf = 0;
+       if (amount >= dst->dstlen) {
+               dst->dstlen = 0;
+               dst->dst    = 0;
        } else {
-               *buf += amount;
-               *n   -= amount;
+               dst->dst    += amount;
+               dst->dstlen -= amount;
        }
 
        return amount;
 }
 
-size_t cdecl__emit(char **dst, size_t *dstlen, const char *src)
+size_t cdecl__emit(struct output_state *dst, const char *src)
 {
-       size_t rc = snprintf(*dst, *dstlen, "%s", src);
-       return cdecl__advance(dst, dstlen, rc);
+       size_t rc = snprintf(dst->dst, dst->dstlen, "%s", src);
+       return cdecl__advance(dst, rc);
 }
 
-static size_t explain_spec(char **dst, size_t *dstlen, struct cdecl_declspec *s)
+static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
        size_t ret;
 
-       ret = cdecl__emit(dst, dstlen, spec_string(s->type));
+       ret = cdecl__emit(dst, spec_string(s->type));
        if (s->ident) {
-               ret += cdecl__emit(dst, dstlen, " " + !ret);
-               ret += cdecl__emit(dst, dstlen, s->ident);
+               ret += cdecl__emit(dst, " " + !ret);
+               ret += cdecl__emit(dst, s->ident);
        }
 
        return ret;
@@ -61,7 +61,7 @@ static size_t explain_spec(char **dst, size_t *dstlen, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__emit_specs(char **dst, size_t *dstlen,
+size_t cdecl__emit_specs(struct output_state *dst,
                          struct cdecl_declspec *s,
                          unsigned mask)
 {
@@ -71,8 +71,8 @@ size_t cdecl__emit_specs(char **dst, size_t *dstlen,
                if (!(s->type & mask))
                        continue;
 
-               ret += cdecl__emit(dst, dstlen, " " + !ret);
-               ret += explain_spec(dst, dstlen, s);
+               ret += cdecl__emit(dst, " " + !ret);
+               ret += explain_spec(dst, s);
        }
 
        return ret;