From b9d67c6ec4c59b204883dfbf346e3b7fca54a84b Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Fri, 23 Jun 2023 00:39:45 -0400
Subject: [PATCH] libcdecl: Make cdecl__emit_specs return value usable
 directly.

Since there is now only one caller of cdecl__emit_specs that cares
about its return value, let's adjust this function to return exactly
what that caller wants, so it doesn't have to do any extra calculation.
---
 src/cdecl-internal.h |  7 ++++---
 src/explain.c        |  5 +----
 src/output.c         | 28 ++++++++++++++--------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/cdecl-internal.h b/src/cdecl-internal.h
index 4024cab..ab62725 100644
--- a/src/cdecl-internal.h
+++ b/src/cdecl-internal.h
@@ -48,8 +48,9 @@ struct output_state {
 
 size_t cdecl__advance(struct output_state *dst, size_t amount);
 size_t cdecl__emit(struct output_state *dst, const char *src);
-size_t cdecl__emit_specs(struct output_state *dst,
-                         struct cdecl_declspec *s,
-                         unsigned mask);
+
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask);
 
 #endif
diff --git a/src/explain.c b/src/explain.c
index 26d39e7..a22b4d0 100644
--- a/src/explain.c
+++ b/src/explain.c
@@ -29,10 +29,7 @@
 
 static void explain_specs(struct output_state *dst, struct cdecl_declspec *s, unsigned mask)
 {
-	size_t rc;
-
-	rc = cdecl__emit_specs(dst, s, mask);
-	cdecl__emit(dst, " " + !rc);
+	cdecl__emit(dst, cdecl__emit_specs(dst, s, mask));
 }
 
 /*
diff --git a/src/output.c b/src/output.c
index b33816a..4590a5c 100644
--- a/src/output.c
+++ b/src/output.c
@@ -43,17 +43,15 @@ size_t cdecl__emit(struct output_state *dst, const char *src)
 	return cdecl__advance(dst, rc);
 }
 
-static size_t explain_spec(struct output_state *dst, 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, spec_string(s->type));
+	rc = cdecl__emit(dst, spec_string(s->type));
 	if (s->ident) {
-		ret += cdecl__emit(dst, " " + !ret);
-		ret += cdecl__emit(dst, s->ident);
+		cdecl__emit(dst, " " + !rc);
+		cdecl__emit(dst, s->ident);
 	}
-
-	return ret;
 }
 
 /*
@@ -61,19 +59,21 @@ static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__emit_specs(struct output_state *dst,
-                         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, " " + !ret);
-		ret += explain_spec(dst, s);
+		cdecl__emit(dst, sep + empty);
+		explain_spec(dst, s);
+		empty = 0;
 	}
 
-	return ret;
+	return sep + empty;
 }
-- 
2.43.2