A few min/max cleanups

[fio.git] / log.c

diff --git a/log.c b/log.c
index c4a3b52075367919b191219f84d14a9b46936338..d508267676b7f9d71f609d6ee5bf058c69897ef5 100644 (file)
--- a/log.c
+++ b/log.c
@@ -6,25 +6,28 @@
 
 #include "fio.h"
 
-int log_valist(const char *str, va_list args)
+size_t log_info_buf(const char *buf, size_t len)
+{
+       if (is_backend)
+               return fio_server_text_output(FIO_LOG_INFO, buf, len);
+       else if (log_syslog) {
+               syslog(LOG_INFO, "%s", buf);
+               return len;
+       } else
+               return fwrite(buf, len, 1, f_out);
+}
+
+size_t log_valist(const char *str, va_list args)
 {
        char buffer[1024];
        size_t len;
 
        len = vsnprintf(buffer, sizeof(buffer), str, args);
-       len = min(len, sizeof(buffer) - 1);
-
-       if (is_backend)
-               len = fio_server_text_output(FIO_LOG_INFO, buffer, len);
-       if (log_syslog)
-               syslog(LOG_INFO, "%s", buffer);
-       else
-               len = fwrite(buffer, len, 1, f_out);
 
-       return len;
+       return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
 }
 
-int log_local_buf(const char *buf, size_t len)
+size_t log_local_buf(const char *buf, size_t len)
 {
        if (log_syslog)
                syslog(LOG_INFO, "%s", buf);
@@ -34,7 +37,7 @@ int log_local_buf(const char *buf, size_t len)
        return len;
 }
 
-int log_info(const char *format, ...)
+size_t log_info(const char *format, ...)
 {
        char buffer[1024];
        va_list args;
@@ -43,15 +46,21 @@ int log_info(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
-       len = min(len, sizeof(buffer) - 1);
 
-       if (is_backend)
-               return fio_server_text_output(FIO_LOG_INFO, buffer, len);
-       else if (log_syslog) {
-               syslog(LOG_INFO, "%s", buffer);
-               return len;
-       } else
-               return fwrite(buffer, len, 1, f_out);
+       return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
+}
+
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
+{
+       char buffer[1024];
+       va_list args;
+       size_t len;
+
+       va_start(args, format);
+       len = vsnprintf(buffer, sizeof(buffer), format, args);
+       va_end(args);
+
+       return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
 }
 
 int log_info_flush(void)
@@ -62,7 +71,7 @@ int log_info_flush(void)
        return fflush(f_out);
 }
 
-int log_err(const char *format, ...)
+size_t log_err(const char *format, ...)
 {
        char buffer[1024];
        va_list args;