log: don't use vsyslog
authorJens Axboe <axboe@kernel.dk>
Tue, 4 Oct 2011 21:46:22 +0000 (23:46 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 4 Oct 2011 21:46:22 +0000 (23:46 +0200)
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 <axboe@kernel.dk>
log.c

diff --git a/log.c b/log.c
index 1dacac41f118fdd4678d3c7e0911518f0bab4c88..ec3ebce49e2065423c7ebefa54bc28b4dd7a25f7 100644 (file)
--- 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, ...)