From: Jens Axboe <axboe@fb.com>
Date: Wed, 24 May 2017 03:43:44 +0000 (-0600)
Subject: log: make log_buf() return how much it wrote
X-Git-Tag: fio-2.21~35
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=c8a07f8778322dda82ca1d87f357be4a41bc0296

log: make log_buf() return how much it wrote

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/log.h b/log.h
index a39dea61..66546c44 100644
--- a/log.h
+++ b/log.h
@@ -16,13 +16,15 @@ 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)
+#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,