X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.h;h=a39dea61893194e7a45740e653dc1e57a39181de;hp=2b2cae0c74ee1aa975d5d91cf966c657ce0cc2d7;hb=dd3805d49995e59fdf61e2560c3fec5b7f5c71b6;hpb=e476994eed3bee246ca166ea6ad6018911408e9b

diff --git a/log.h b/log.h
index 2b2cae0c..a39dea61 100644
--- a/log.h
+++ b/log.h
@@ -4,19 +4,33 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "lib/output_buffer.h"
+
 extern FILE *f_out;
 extern FILE *f_err;
 
-extern int log_err(const char *format, ...);
-extern int log_info(const char *format, ...);
-extern int log_local(const char *format, ...);
-extern int log_valist(const char *str, va_list);
-extern int log_local_buf(const char *buf, size_t);
+extern size_t log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+extern size_t log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+extern size_t __log_buf(struct buf_output *, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+extern size_t log_valist(const char *str, va_list);
+extern size_t log_info_buf(const char *buf, size_t len);
+extern int log_info_flush(void);
+
+#define log_buf(buf, format, args...)		\
+do {						\
+	if ((buf) != NULL)			\
+		__log_buf(buf, format, ##args);	\
+	else					\
+		log_info(format, ##args);	\
+} while (0)
 
 enum {
 	FIO_LOG_DEBUG	= 1,
 	FIO_LOG_INFO	= 2,
 	FIO_LOG_ERR	= 3,
+	FIO_LOG_NR	= 4,
 };
 
+extern const char *log_get_level(int level);
+
 #endif