lib: add igt_vlog to print varargs

... and put it to immediate use in igt_display_log.

To make this all add up also drop the return value of igt_display_log,
no one really cared anyway.

Aside: I've noticed that every time another subtest runs (at least
with kms_pipe_crc_basic) the log indent level moves one up ...

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

3 files changed, 33 insertions, 10 deletions

diff --git a/lib/igt_core.c b/lib/igt_core.c
index 13259b61..ff471178 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1074,3 +1074,30 @@ void igt_log(enum igt_log_level level, const char *format, ...)
 		vprintf(format, args);
 	va_end(args);
 }
+
+/**
+ * igt_vlog:
+ * @level: #igt_log_level
+ * @format: format string
+ * @args: variable arguments lists
+ *
+ * This is the generic logging helper function using an explicit varargs
+ * structure and hence useful to implement domain-specific logging
+ * functions.
+ *
+ * If there is no need to wrap up a vararg list in the caller it is simpler to
+ * just use igt_log().
+ */
+void igt_vlog(enum igt_log_level level, const char *format, va_list args)
+{
+	assert(format);
+
+	if (igt_log_level > level)
+		return;
+
+	if (level == IGT_LOG_WARN) {
+		fflush(stdout);
+		vfprintf(stderr, format, args);
+	} else
+		vprintf(format, args);
+}
diff --git a/lib/igt_core.h b/lib/igt_core.h
index 0e3d7be0..5c9065a5 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -389,6 +389,7 @@ enum igt_log_level {
 };
 __attribute__((format(printf, 2, 3)))
 void igt_log(enum igt_log_level level, const char *format, ...);
+void igt_vlog(enum igt_log_level level, const char *format, va_list args);
 
 /**
  * igt_debug:
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 2c0f89d8..d5d9e022 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -817,23 +817,18 @@ const char *plane_name(enum igt_plane p)
 	} while (0)
 #define LOG(d, fmt, ...)	igt_display_log(d, fmt, ## __VA_ARGS__)
 
-static int  __attribute__((format(printf, 2, 3)))
+static void  __attribute__((format(printf, 2, 3)))
 igt_display_log(igt_display_t *display, const char *fmt, ...)
 {
 	va_list args;
-	int n, i;
-
-	if (igt_log_level > IGT_LOG_DEBUG)
-		return 0;
+	int i;
 
 	va_start(args, fmt);
-	n = printf("display: ");
+	igt_debug("display: ");
 	for (i = 0; i < display->log_shift; i++)
-		n += printf("%s", LOG_SPACES);
-	n += vprintf(fmt, args);
+		igt_debug("%s", LOG_SPACES);
+	igt_vlog(IGT_LOG_DEBUG, fmt, args);
 	va_end(args);
-
-	return n;
 }
 
 static void igt_display_log_shift(igt_display_t *display, int shift)