GPL headers: Use correct project name.

[libsigrok.git] / output / binary.c

diff --git a/output/binary.c b/output/binary.c
index daf0feab8dc4e3cf18a003eccf23281fc2728421..43dbf7307985f61521832d90649acfd0ad641ca2 100644 (file)
--- a/output/binary.c
+++ b/output/binary.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -21,34 +21,42 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
-               char **data_out, uint64_t *length_out)
+/* 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)
 {
-       char *outbuf;
+       uint8_t *outbuf;
 
-       /* Prevent compiler warnings. */
        (void)o;
 
        if (!data_in) {
-               sr_warn("binary output: %s: data_in was NULL", __func__);
-               return SR_ERR;
+               sr_err("%s: data_in was NULL", __func__);
+               return SR_ERR_ARG;
        }
 
        if (!length_out) {
-               sr_warn("binary output: %s: length_out was NULL", __func__);
-               return SR_ERR;
+               sr_err("%s: length_out was NULL", __func__);
+               return SR_ERR_ARG;
        }
 
        if (length_in == 0) {
-               sr_warn("binary output: %s: length_in was 0", __func__);
-               return SR_ERR;
+               sr_err("%s: length_in was 0", __func__);
+               return SR_ERR_ARG;
        }
 
-       if (!(outbuf = calloc(1, length_in))) {
-               sr_warn("binary output: %s: outbuf calloc failed", __func__);
+       if (!(outbuf = g_try_malloc0(length_in))) {
+               sr_err("%s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
@@ -59,7 +67,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
        return SR_OK;
 }
 
-struct sr_output_format output_binary = {
+SR_PRIV struct sr_output_format output_binary = {
        .id = "binary",
        .description = "Raw binary",
        .df_type = SR_DF_LOGIC,