#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"
#include "errmsg.h"
-gl_once_define(static, tls_initialized);
-static gl_tls_key_t tls_key;
-
struct err_state {
struct cdecl_error err;
size_t nstr;
/* This pre-initialized error is reserved for dire out-of-memory conditions. */
static struct cdecl_error err_no_mem;
+static gl_tls_key_t tls_key;
static void free_err(void *err)
{
err->str = _(&errmsgs[code]);
}
-static void initialize(void)
+static void initialize_cb(void)
{
- cdecl__init_i18n();
+#if ENABLE_NLS
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bindtextdomain("bison-runtime", BISON_LOCALEDIR);
+#endif
set_err(CDECL__ENOMEM, &err_no_mem);
gl_tls_key_init(tls_key, free_err);
}
{
void *state;
- gl_once(tls_initialized, initialize);
+ gl_once_define(static, tls_initialized)
+ gl_once(tls_initialized, initialize_cb);
state = gl_tls_get(tls_key);
if (state == &err_no_mem)
return state;
}
+
+#if ENABLE_NLS
+/*
+ * Initialize gettext indirectly via get_err_state.
+ */
+void cdecl__init_i18n(void)
+{
+ get_err_state();
+}
+#endif
+
/*
* Set the library error to one of the preset messages defined in errmsg.h
* (CDECL__Exxx).
}
/*
- * 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);