diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2021-02-09 12:32:33 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2021-02-09 12:32:33 +0000 |
| commit | 7656744877f55658c205b1c5d2bf76651def10b2 (patch) | |
| tree | f93bd378247a2e0e678de1eb98678a95dac96c11 /debug.c | |
| parent | render: use portable HAS_INCLUDE() wrapper instead of __has_include() (diff) | |
debug: make use of log_msg() in fatal_error() and bug() functions
Instead of writing directly to stderr and/or syslog(3).
Diffstat (limited to 'debug.c')
| -rw-r--r-- | debug.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <syslog.h> +#include "log.h" #if defined(__SANITIZE_ADDRESS__) || HAS_FEATURE(address_sanitizer) #include <sanitizer/asan_interface.h> @@ -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(); |
