From cda55d7de41c5cd5bd0ec42fa4f7500f8c763825 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 7 May 2021 16:40:19 +0200 Subject: log: add va_list versions of log_* functions --- log.c | 78 ++++++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 27 deletions(-) (limited to 'log.c') diff --git a/log.c b/log.c index 8b4e8131..fba53876 100644 --- a/log.c +++ b/log.c @@ -122,43 +122,67 @@ _sys_log(enum log_class log_class, const char *module, syslog(level, "%s: %s", module, msg); } +void +log_msg_va(enum log_class log_class, const char *module, + const char *file, int lineno, const char *fmt, va_list va) +{ + va_list va2; + va_copy(va2, va); + _log(log_class, module, file, lineno, fmt, 0, va); + _sys_log(log_class, module, file, lineno, fmt, 0, va2); + va_end(va2); +} + void log_msg(enum log_class log_class, const char *module, const char *file, int lineno, const char *fmt, ...) { - va_list ap1, ap2; - va_start(ap1, fmt); - va_copy(ap2, ap1); - _log(log_class, module, file, lineno, fmt, 0, ap1); - _sys_log(log_class, module, file, lineno, fmt, 0, ap2); - va_end(ap1); - va_end(ap2); + va_list va; + va_start(va, fmt); + log_msg_va(log_class, module, file, lineno, fmt, va); + va_end(va); +} + +void +log_errno_va(enum log_class log_class, const char *module, + const char *file, int lineno, + const char *fmt, va_list va) +{ + log_errno_provided_va(log_class, module, file, lineno, errno, fmt, va); } -void log_errno(enum log_class log_class, const char *module, - const char *file, int lineno, - const char *fmt, ...) +void +log_errno(enum log_class log_class, const char *module, + const char *file, int lineno, + const char *fmt, ...) { - va_list ap1, ap2; - va_start(ap1, fmt); - va_copy(ap2, ap1); - _log(log_class, module, file, lineno, fmt, errno, ap1); - _sys_log(log_class, module, file, lineno, fmt, errno, ap2); - va_end(ap1); - va_end(ap2); + va_list va; + va_start(va, fmt); + log_errno_va(log_class, module, file, lineno, fmt, va); + va_end(va); } -void log_errno_provided(enum log_class log_class, const char *module, - const char *file, int lineno, int errno_copy, - const char *fmt, ...) +void +log_errno_provided_va(enum log_class log_class, const char *module, + const char *file, int lineno, int errno_copy, + const char *fmt, va_list va) +{ + va_list va2; + va_copy(va2, va); + _log(log_class, module, file, lineno, fmt, errno_copy, va); + _sys_log(log_class, module, file, lineno, fmt, errno_copy, va2); + va_end(va2); +} + +void +log_errno_provided(enum log_class log_class, const char *module, + const char *file, int lineno, int errno_copy, + const char *fmt, ...) { - va_list ap1, ap2; - va_start(ap1, fmt); - va_copy(ap2, ap1); - _log(log_class, module, file, lineno, fmt, errno_copy, ap1); - _sys_log(log_class, module, file, lineno, fmt, errno_copy, ap2); - va_end(ap1); - va_end(ap2); + va_list va; + va_start(va, fmt); + log_errno_provided_va(log_class, module, file, lineno, errno_copy, fmt, va); + va_end(va); } int -- cgit v1.3