X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fbinary.c;h=2fd858eb5e3466c53b3ed7bb8dce97cd34373545;hb=c43cf4d40e2b73d992c73c340a887888f05595e0;hp=f0a3c35a9f9a03e30d5266e8fd35f52bb815d049;hpb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95;p=libsigrok.git

diff --git a/output/binary.c b/output/binary.c
index f0a3c35a..2fd858eb 100644
--- 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 subsystem-specific prefix string. */
+#define LOG_PREFIX "output/binary: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX 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;
 	}