X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/ed00362ec1f6f385d03ea5ca2b3dc3a8c25f4426..6f166c6c36bda84191ed916a52b311ab417a4890:/src/declare.c
diff --git a/src/declare.c b/src/declare.c
index d5af714..3b0b700 100644
--- 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 .
*/
+
#include
#include
#include
#include
#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