X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fbinary.c;h=dd0cf4744ed6bffeccb6c72cf0b06d1692c99ac6;hb=fe997353bf0c66425997bb84a0ad1041faf2a60e;hp=bbf49c705e6bf4f7b10b18bd8fbdef3e7a066706;hpb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;p=libsigrok.git

diff --git a/output/binary.c b/output/binary.c
index bbf49c70..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,34 +21,35 @@
 #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)
+#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_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;
 	}