libcdecl: Avoid vsnprintf for error reporting.

[cdecl99.git] / src / error.c

diff --git a/src/error.c b/src/error.c
index 5466d393b05d03096e5b4dd36bb8fb6a8b045b6c..36e63666774d6a34cbf0ad99c0d14d06044adf85 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -19,9 +19,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
-#include <stdarg.h>
 
 #include "cdecl.h"
 #include "cdecl-internal.h"
@@ -124,23 +122,20 @@ void cdecl__errmsg(unsigned msg)
 }
 
 /*
- * Sets the library error to code, with a printf-style error string.
+ * Sets the library error to code; fmt is a printf-style string that may use
+ * up to one %s directive, to refer to arg.
  */
-void cdecl__err(unsigned code, const char *fmt, ...)
+void cdecl__err(unsigned code, const char *fmt, const char *arg)
 {
        struct err_state *state;
        int rc, try = 0;
-       va_list ap;
 
        state = get_err_state();
        if (!state)
                return;
 
 retry:
-       va_start(ap, fmt);
-       rc = vsnprintf(state->str, state->nstr, fmt, ap);
-       va_end(ap);
-
+       rc = snprintf(state->str, state->nstr, fmt, arg);
        if (rc > 0 && rc >= state->nstr) {
                assert(try++ == 0 && rc < SIZE_MAX / 4);
                state = alloc_err_state(state, (size_t)(rc+1u) * 3 / 2);