X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Ferror.c;h=f940be6d232b05eb5eceff1b08f6aa13d62642ac;hb=05f5ac1f08dfe0d8f7216390a103ec58788c8ef9;hp=6bf64c2a25983347142d8e591b9d1fcee67460b7;hpb=ddb7ffc175e49abfa69c82777b88d73e1f1103fb;p=sysdb.git diff --git a/src/utils/error.c b/src/utils/error.c index 6bf64c2..f940be6 100644 --- a/src/utils/error.c +++ b/src/utils/error.c @@ -25,16 +25,20 @@ * 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 #include +#include #include -#include - #include +#include /* * private data types @@ -43,7 +47,7 @@ typedef struct { int prio; sdb_strbuf_t *msg; - _Bool logged; + bool logged; } sdb_error_ctx_t; #define SDB_ERROR_INIT { -1, NULL, 1 } @@ -54,7 +58,7 @@ typedef struct { 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; @@ -191,13 +195,19 @@ 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, ...)