From 8d40ad6c0c09b9e5bbd9b74430c5b150ae424cfa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 11 Dec 2019 08:45:42 +1000 Subject: [PATCH] libratbag: only log to stderr for error messages This was copied from libinput and made sense while libratbag was a library - we want "unhandled" messages to end up somewhere and stderr is the most likely candidate here. Now that we always run within ratbagd and it's all effectively inseperable, just log to stdout for anything below error. The switch statement was reformatted for consistency, only the ERROR case has changed code. Signed-off-by: Peter Hutterer --- src/libratbag.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/libratbag.c b/src/libratbag.c index 88ded13e..df42f79c 100644 --- a/src/libratbag.c +++ b/src/libratbag.c @@ -71,17 +71,29 @@ ratbag_default_log_func(struct ratbag *ratbag, const char *format, va_list args) { const char *prefix; + FILE *out = stdout; switch(priority) { - case RATBAG_LOG_PRIORITY_RAW: prefix = "raw"; break; - case RATBAG_LOG_PRIORITY_DEBUG: prefix = "debug"; break; - case RATBAG_LOG_PRIORITY_INFO: prefix = "info"; break; - case RATBAG_LOG_PRIORITY_ERROR: prefix = "error"; break; - default: prefix=""; break; + case RATBAG_LOG_PRIORITY_RAW: + prefix = "raw"; + break; + case RATBAG_LOG_PRIORITY_DEBUG: + prefix = "debug"; + break; + case RATBAG_LOG_PRIORITY_INFO: + prefix = "info"; + break; + case RATBAG_LOG_PRIORITY_ERROR: + prefix = "error"; + out = stderr; + break; + default: + prefix=""; + break; } - fprintf(stderr, "ratbag %s: ", prefix); - vfprintf(stderr, format, args); + fprintf(out, "ratbag %s: ", prefix); + vfprintf(out, format, args); } void