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

diff --git a/log.h b/log.h
index 2b2cae0c..562f3f42 100644
--- a/log.h
+++ b/log.h
@@ -3,20 +3,38 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <unistd.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 ssize_t log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+extern ssize_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 void log_prevalist(int type, 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...)			\
+({							\
+	size_t __ret;					\
+	if ((buf) != NULL)				\
+		__ret = __log_buf(buf, format, ##args);	\
+	else						\
+		__ret = log_info(format, ##args);	\
+	__ret;						\
+})
 
 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