X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/4b14cf4c3fa99fe5341f482cbe57058a87197d41..5383a8b913e74ebe5faa39ef3e570afb95779141:/src/error.c

diff --git a/src/error.c b/src/error.c
index 5466d39..cf4411e 100644
--- 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"
@@ -31,9 +29,6 @@
 
 #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;
@@ -42,6 +37,7 @@ struct err_state {
 
 /* 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)
 {
@@ -67,9 +63,12 @@ static void set_err(unsigned code, struct cdecl_error *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);
 }
@@ -98,7 +97,8 @@ static struct err_state *get_err_state(void)
 {
 	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)
@@ -108,6 +108,17 @@ static struct err_state *get_err_state(void)
 	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).
@@ -124,23 +135,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);