Output modules: Use message logging helpers.

[libsigrok.git] / output / binary.c

diff --git a/output/binary.c b/output/binary.c
index 003b6ce077f7eb87a17d67a70adc9fb3e4e76090..71c7c837d49097a81ad012d4e994c14beffc93cd 100644 (file)
--- a/output/binary.c
+++ b/output/binary.c
@@ -24,6 +24,15 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "output/binary: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
 static int data(struct sr_output *o, const uint8_t *data_in,
                uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
 {
@@ -32,22 +41,22 @@ static int data(struct sr_output *o, const uint8_t *data_in,
        (void)o;
 
        if (!data_in) {
-               sr_err("binary out: %s: data_in was NULL", __func__);
+               sr_err("%s: data_in was NULL", __func__);
                return SR_ERR_ARG;
        }
 
        if (!length_out) {
-               sr_err("binary out: %s: length_out was NULL", __func__);
+               sr_err("%s: length_out was NULL", __func__);
                return SR_ERR_ARG;
        }
 
        if (length_in == 0) {
-               sr_err("binary out: %s: length_in was 0", __func__);
+               sr_err("%s: length_in was 0", __func__);
                return SR_ERR_ARG;
        }
 
        if (!(outbuf = g_try_malloc0(length_in))) {
-               sr_err("binary out: %s: outbuf malloc failed", __func__);
+               sr_err("%s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
        }