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.

diff --git a/src/cdecl-internal.h b/src/cdecl-internal.h
index 4024cab26994908702008ae93eefd5474f82cea6..ab6272590ed011573c5a2099a1ca4e3bbf516889 100644 (file)
--- 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 26d39e7a7037e1849c7749aabee11864f6ab5631..a22b4d05a3d233ebc50fc9d15a30cee28f4e3873 100644 (file)
--- 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 b33816aafdc64fc6785cddad0849bb6f5bc88741..4590a5cfc60b2fb9c3d1bdead751da7d37b25d9b 100644 (file)
--- 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;
 }