X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fbinary.c;h=dd0cf4744ed6bffeccb6c72cf0b06d1692c99ac6;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=039d10bcea3d09428fafc29cc47ea2c39466ffa6;hpb=0da5b6a9f5a119ab485ed3dba08aeb4a3ad2c8f4;p=libsigrok.git

diff --git a/output/binary.c b/output/binary.c
index 039d10bc..dd0cf474 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,35 +21,35 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
-#include "config.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)
+#define LOG_PREFIX "output/binary:"
+
+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;
 	}
 
@@ -60,7 +60,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,