Move advance/advance_ into common code.

[cdecl99.git] / src / explain.c

diff --git a/src/explain.c b/src/explain.c
index a0b1449694fb1bb27be6079ea0327dcaffdd2ebf..dadc65f3058122732fcc3107924a4dc3bfaee4e2 100644 (file)
--- a/src/explain.c
+++ b/src/explain.c
@@ -23,31 +23,7 @@
 
 #include "cdecl.h"
 #include "typemap.h"
-
-static size_t advance_(char **buf, size_t *n, size_t amount)
-{
-       if (amount >= *n) {
-               *n   = 0;
-               *buf = 0;
-       } else {
-               *buf += amount;
-               *n   -= amount;
-       }
-
-       return amount;
-}
-
-static size_t advance(char **buf, size_t *n, size_t amount)
-{
-       size_t ret, rc;
-
-       if (!amount)
-               return 0;
-
-       ret = advance_(buf, n, amount);
-       rc = snprintf(*buf, *n, " ");
-       return ret + advance_(buf, n, rc);
-}
+#include "output.h"
 
 static size_t
 explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
@@ -62,15 +38,15 @@ explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
        }
 
        if (qualmap & (1ul << (CDECL_QUAL_RESTRICT & 0xff))) {
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
                rc = snprintf(buf, n, "restrict");
        }
        if (qualmap & (1ul << (CDECL_QUAL_VOLATILE & 0xff))) {
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
                rc = snprintf(buf, n, "volatile");
        }
        if (qualmap & (1ul << (CDECL_QUAL_CONST & 0xff))) {
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
                rc = snprintf(buf, n, "const");
        }
 
@@ -99,11 +75,11 @@ explain_post_specs(char *buf, size_t n, struct cdecl_declspec *s)
        }
 
        rc = explain_qualifiers(buf, n, s);
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        rc = snprintf(buf, n, "%s", cdecl__explain_typemap(typemap));
        if (tag) {
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
                rc = snprintf(buf, n, "%s", tag);
        }
 
@@ -148,7 +124,7 @@ static size_t explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
        }
 
        if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
                rc = snprintf(buf, n, "inline");
        }
 
@@ -173,7 +149,7 @@ explain_prologue(char *buf, size_t n, struct cdecl_declarator *d, bool top)
                case CDECL_DECL_IDENT:
                        if (top)
                                rc = snprintf(buf, n, "declare");
-                       ret += advance(&buf, &n, rc);
+                       ret += cdecl__advance(&buf, &n, rc);
                        return ret + snprintf(buf, n, "%s as", d->u.ident);
                }
 
@@ -187,7 +163,7 @@ explain_pointer(char *buf, size_t n, struct cdecl_pointer *p)
        size_t ret = 0, rc;
 
        rc = explain_qualifiers(buf, n, p->qualifiers);
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        return ret + snprintf(buf, n, "pointer to");
 }
@@ -201,14 +177,14 @@ explain_array(char *buf, size_t n, struct cdecl_array *a)
                rc = snprintf(buf, n, "variable-length array");
        else
                rc = snprintf(buf, n, "array");
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        if (a->vla) {
                rc = snprintf(buf, n, "%s", a->vla);
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
        } else if (a->length) {
                rc = snprintf(buf, n, "%ju", a->length);
-               ret += advance(&buf, &n, rc);
+               ret += cdecl__advance(&buf, &n, rc);
        }
 
        return ret + snprintf(buf, n, "of");
@@ -222,13 +198,13 @@ static size_t explain_decl(char *buf, size_t n, struct cdecl *decl, bool top)
        size_t ret = 0, rc;
 
        rc = explain_prologue(buf, n, decl->declarators, top);
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        rc = explain_pre_specs(buf, n, decl->specifiers);
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        rc = explain_declarators(buf, n, decl->declarators);
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        return ret + explain_post_specs(buf, n, decl->specifiers);
 }
@@ -238,15 +214,15 @@ static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
        size_t ret = 0, rc = 0;
 
        rc = snprintf(buf, n, "function");
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        if (f->parameters) {
                rc = snprintf(buf, n, "(");
-               ret += advance_(&buf, &n, rc);
+               ret += cdecl__advance_(&buf, &n, rc);
 
                for (struct cdecl *p = f->parameters; p; p = p->next) {
                        rc = explain_decl(buf, n, p, false);
-                       ret += advance_(&buf, &n, rc);
+                       ret += cdecl__advance_(&buf, &n, rc);
 
                        if (p->next)
                                rc = snprintf(buf, n, ",");
@@ -254,7 +230,7 @@ static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
                                rc = snprintf(buf, n, ", ...)");
                        else
                                rc = snprintf(buf, n, ")");
-                       ret += advance(&buf, &n, rc);
+                       ret += cdecl__advance(&buf, &n, rc);
                }
        }
 
@@ -270,7 +246,7 @@ explain_declarators(char *buf, size_t n, struct cdecl_declarator *d)
                return 0;
 
        rc = explain_declarators(buf, n, d->child);
-       ret += advance(&buf, &n, rc);
+       ret += cdecl__advance(&buf, &n, rc);
 
        switch (d->type) {
        case CDECL_DECL_POINTER: