libcdecl: Rework cdecl_explain output logic.

[cdecl99.git] / src / declare.c

diff --git a/src/declare.c b/src/declare.c
index d5af7149e551570dee37569413eafdcd9553dfe1..3b0b7006ed71a1bdb416e7a9ccb52d986eb549cc 100644 (file)
--- a/src/declare.c
+++ b/src/declare.c
@@ -1,6 +1,6 @@
 /*
  *  Render C declarations.
- *  Copyright © 2011 Nick Bowler
+ *  Copyright © 2011, 2021, 2023 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,27 +15,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <config.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <assert.h>
 
 #include "cdecl.h"
-#include "output.h"
-
-static size_t declare_specs(char *buf, size_t n, struct cdecl_declspec *s)
-{
-       size_t ret = 0, rc;
-
-       if (!s)
-               return 0;
-
-       rc = cdecl__explain_pre_specs(buf, n, s);
-       ret += cdecl__advance(&buf, &n, rc);
-
-       rc = cdecl__explain_post_specs(buf, n, s);
-       return ret + rc;
-}
+#include "cdecl-internal.h"
 
 static size_t
 declare_declarator(char *buf, size_t n, struct cdecl_declarator *d);
@@ -44,7 +31,7 @@ static size_t declare_decl(char *buf, size_t n, struct cdecl *decl)
 {
        size_t ret = 0, rc;
 
-       rc = declare_specs(buf, n, decl->specifiers);
+       rc = cdecl__explain_specs(buf, n, decl->specifiers, -1);
        if (decl->declarators->type != CDECL_DECL_NULL)
                ret += cdecl__advance(&buf, &n, rc);
        else