#include <glthread/lock.h>
#include <glthread/tls.h>
-gl_once_define(static, tls_initialized);
+#include "errmsg.h"
+
+gl_once_define(static, tls_initialized)
static gl_tls_key_t tls_key;
struct err_state {
free(err);
}
+static void set_err(unsigned code, struct cdecl_error *err)
+{
+ static const char errmsgs[] = STRTAB_INITIALIZER;
+
+ switch (code) {
+ case CDECL__ENOMEM:
+ err->code = CDECL_ENOMEM;
+ break;
+ default:
+ err->code = CDECL_ENOPARSE;
+ break;
+ }
+
+ err->str = _(&errmsgs[code]);
+}
+
static void initialize(void)
{
cdecl__init_i18n();
- err_no_mem.str = _("failed to allocate memory");
+ set_err(CDECL__ENOMEM, &err_no_mem);
gl_tls_key_init(tls_key, free_err);
}
}
/*
- * cdecl__err(CDECL_ENOMEM);
- * cdecl__err(code, fmt, ...);
- *
+ * Set the library error to one of the preset messages defined in errmsg.h
+ * (CDECL__Exxx).
+ */
+void cdecl__errmsg(unsigned msg)
+{
+ struct err_state *state;
+
+ state = get_err_state();
+ if (!state)
+ return;
+
+ set_err(msg, &state->err);
+}
+
+/*
* Sets the library error to code, with a printf-style error string.
*/
-void cdecl__err(unsigned code, ...)
+void cdecl__err(unsigned code, const char *fmt, ...)
{
- const char *fmt;
struct err_state *state;
int rc, try = 0;
va_list ap;
if (!state)
return;
- if (code == CDECL_ENOMEM) {
- state->err.code = code;
- state->err.str = err_no_mem.str;
- return;
- }
retry:
- va_start(ap, code);
- fmt = va_arg(ap, const char *);
+ va_start(ap, fmt);
rc = vsnprintf(state->str, state->nstr, fmt, ap);
va_end(ap);