From 7656744877f55658c205b1c5d2bf76651def10b2 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Tue, 9 Feb 2021 12:32:33 +0000 Subject: debug: make use of log_msg() in fatal_error() and bug() functions Instead of writing directly to stderr and/or syslog(3). --- debug.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'debug.c') diff --git a/debug.c b/debug.c index 03ead23b..8a86e9df 100644 --- a/debug.c +++ b/debug.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "log.h" #if defined(__SANITIZE_ADDRESS__) || HAS_FEATURE(address_sanitizer) #include @@ -22,26 +22,25 @@ print_stack_trace(void) } noreturn void -fatal_error(const char *msg, int err) +fatal_error(const char *file, int line, const char *msg, int err) { - syslog(LOG_ERR, "%s: %s", msg, strerror(err)); - errno = err; - perror(msg); + log_msg(LOG_CLASS_ERROR, "debug", file, line, "%s: %s", msg, strerror(err)); print_stack_trace(); + fflush(stderr); abort(); } noreturn void bug(const char *file, int line, const char *func, const char *fmt, ...) { - fprintf(stderr, "\n%s:%d: BUG in %s(): ", file, line, func); - + char buf[4096]; va_list ap; va_start(ap, fmt); - vfprintf(stderr, fmt, ap); + int n = vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - fputc('\n', stderr); + const char *msg = likely(n >= 0) ? buf : "??"; + log_msg(LOG_CLASS_ERROR, "debug", file, line, "BUG in %s(): %s", func, msg); print_stack_trace(); fflush(stderr); abort(); -- cgit v1.3