diff --git a/src/utils/error.c b/src/utils/error.c
index c62b20d5c6c6f22c2230b21320f2fae93a9bd5d8..f0a48271c91d75b4a60dfb36b6203374887e83a1 100644 (file)
--- a/src/utils/error.c
+++ b/src/utils/error.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "utils/error.h"
#include "utils/strbuf.h"
#include <pthread.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <stdio.h>
-#include <string.h>
-
#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
/*
* private data types
typedef struct {
int prio;
sdb_strbuf_t *msg;
- _Bool logged;
+ bool logged;
} sdb_error_ctx_t;
#define SDB_ERROR_INIT { -1, NULL, 1 }
static sdb_error_ctx_t default_error_ctx = SDB_ERROR_INIT;
static pthread_key_t error_ctx_key;
-static _Bool error_ctx_key_initialized = 0;
+static bool error_ctx_key_initialized = 0;
+
+static int (*logger)(int prio, const char *msg) = NULL;
/*
* private helper functions
if (ctx->logged)
return 0;
- ret = fprintf(stderr, "[%s] %s\n",
- SDB_LOG_PRIO_TO_STRING(prio),
- sdb_strbuf_string(ctx->msg));
+ if (logger)
+ ret = logger(prio, sdb_strbuf_string(ctx->msg));
+ else
+ ret = fprintf(stderr, "[%s] %s\n", SDB_LOG_PRIO_TO_STRING(prio),
+ sdb_strbuf_string(ctx->msg));
+
ctx->logged = 1;
return ret;
} /* sdb_do_log */
* public API
*/
+void
+sdb_error_set_logger(int (*f)(int, const char *))
+{
+ logger = f;
+} /* sdb_error_set_logger */
+
int
sdb_log(int prio, const char *fmt, ...)
{
int ret;
va_start(ap, fmt);
- ret = sdb_error_vprintf(fmt, ap);
+ ret = sdb_vlog(prio, fmt, ap);
va_end(ap);
+ return ret;
+} /* sdb_log */
+int
+sdb_vlog(int prio, const char *fmt, va_list ap)
+{
+ int ret = sdb_error_vprintf(fmt, ap);
if (ret > 0)
sdb_do_log(prio);
return ret;
-} /* sdb_log */
+} /* sdb_vlog */
int
sdb_error_set(const char *fmt, ...)
return ctx->prio;
} /* sdb_error_get_prio */
+int
+sdb_error_parse_priority(char *prio)
+{
+ if (! strcasecmp(prio, "EMERG"))
+ return SDB_LOG_EMERG;
+ else if (! strcasecmp(prio, "ERROR"))
+ return SDB_LOG_ERR;
+ else if (! strcasecmp(prio, "WARNING"))
+ return SDB_LOG_WARNING;
+ else if (! strcasecmp(prio, "NOTICE"))
+ return SDB_LOG_NOTICE;
+ else if (! strcasecmp(prio, "INFO"))
+ return SDB_LOG_INFO;
+ else if (! strcasecmp(prio, "DEBUG"))
+ return SDB_LOG_DEBUG;
+ return -1;
+} /* sdb_error_parse_priority */
+
char *
sdb_strerror(int errnum, char *strerrbuf, size_t buflen)
{