From 734f38cb03e03390cddfd2d31cdbbd3f3d7f9e7f Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 4 Oct 2011 23:46:22 +0200 Subject: [PATCH] log: don't use vsyslog AIX/HPUX don't have it at least, and since we use a crappy fixed length buffer anyway, just use syslog(). Signed-off-by: Jens Axboe --- log.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/log.c b/log.c index 1dacac41..ec3ebce4 100644 --- a/log.c +++ b/log.c @@ -8,16 +8,17 @@ int log_valist(const char *str, va_list args) { - if (log_syslog) { - vsyslog(LOG_INFO, str, args); - return 0; - } else { - char buffer[1024]; - size_t len; - - len = vsnprintf(buffer, sizeof(buffer), str, args); - return fwrite(buffer, len, 1, f_out); - } + char buffer[1024]; + size_t len; + + len = vsnprintf(buffer, sizeof(buffer), str, args); + + if (log_syslog) + syslog(LOG_INFO, "%s", buffer); + else + len = fwrite(buffer, len, 1, f_out); + + return len; } int log_local(const char *format, ...) @@ -27,16 +28,15 @@ int log_local(const char *format, ...) size_t len; va_start(args, format); + len = vsnprintf(buffer, sizeof(buffer), format, args); + va_end(args); - if (log_syslog) { - vsyslog(LOG_INFO, format, args); - va_end(args); - return 0; - } else { - len = vsnprintf(buffer, sizeof(buffer), format, args); - va_end(args); - return fwrite(buffer, len, 1, f_out); - } + if (log_syslog) + syslog(LOG_INFO, "%s", buffer); + else + len = fwrite(buffer, len, 1, f_out); + + return len; } int log_info(const char *format, ...) -- 2.25.1