#include "specstr.h"
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+#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__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 void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
{
- size_t ret;
+ size_t rc;
- ret = cdecl__emit(dst, dstlen, spec_string(s->type));
+ rc = cdecl__emit(dst, spec_string(s->type));
if (s->ident) {
- ret += cdecl__emit(dst, dstlen, " " + !ret);
- ret += cdecl__emit(dst, dstlen, s->ident);
+ cdecl__emit(dst, " " + !rc);
+ cdecl__emit(dst, s->ident);
}
-
- return ret;
}
/*
* 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,
- 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;
+ const char *sep = " ";
+ int empty = 1;
for (; s; s = s->next) {
if (!(s->type & mask))
continue;
- ret += cdecl__emit(dst, dstlen, " " + !ret);
- ret += explain_spec(dst, dstlen, s);
+ cdecl__emit(dst, sep + empty);
+ explain_spec(dst, s);
+ empty = 0;
}
- return ret;
+ return sep + empty;
}