Correctly handle multiple clients for various command line arguments

[fio.git] / log.c

diff --git a/log.c b/log.c
index 1dacac41f118fdd4678d3c7e0911518f0bab4c88..a16baafc97846f68e08b1d466eff67ed130b24ae 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, ...)
@@ -68,8 +68,11 @@ int log_err(const char *format, ...)
        if (is_backend)
                return fio_server_text_output(buffer, len);
        else {
-               if (f_err != stderr)
-                       fwrite(buffer, len, 1, stderr);
+               if (f_err != stderr) {
+                       int fio_unused ret;
+
+                       ret = fwrite(buffer, len, 1, stderr);
+               }
 
                return fwrite(buffer, len, 1, f_err);
        }