* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
#include <stdarg.h>
#include <stdio.h>
+#include <glib/gprintf.h>
/**
* @file
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;
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 */
return ret;
}
-/** @private */
-SRD_PRIV int srd_spew(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_SPEW, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_dbg(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_DBG, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_info(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_INFO, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_warn(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_WARN, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_err(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_ERR, format, args);
- va_end(args);
-
- return ret;
-}
-
/** @} */