From ef3a66299ade1bc41090d0b6d24c21b6bcfad571 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Sun, 13 Sep 2015 23:05:42 +0200 Subject: log: Use GLib printf for consistency Just as in libsigrok, use g_vfprintf() in the log callback to make sure we are linking to a standard-conforming printf implementation. --- log.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'log.c') diff --git a/log.c b/log.c index 73c1fdd..0d8bbfa 100644 --- a/log.c +++ b/log.c @@ -23,6 +23,7 @@ #include "libsigrokdecode.h" #include #include +#include /** * @file @@ -153,8 +154,6 @@ SRD_API int srd_log_callback_set_default(void) static int srd_logv(void *cb_data, int loglevel, const char *format, va_list args) { - int ret; - /* This specific log callback doesn't need the void pointer data. */ (void)cb_data; @@ -162,11 +161,12 @@ static int srd_logv(void *cb_data, int loglevel, const char *format, if (loglevel > cur_loglevel) return SRD_OK; - fputs("srd: ", stderr); - ret = vfprintf(stderr, format, args); - fprintf(stderr, "\n"); + if (fputs("srd: ", stderr) < 0 + || g_vfprintf(stderr, format, args) < 0 + || putc('\n', stderr) < 0) + return SRD_ERR; - return ret; + return SRD_OK; } /** @private */ -- cgit v1.2.3-70-g09d2