X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=54d0e3396bb095258ddf13104ac122acd33632f6;hb=db7d0626c918209db0ba5dc6e896232c8c2e4f6c;hp=1f7064c8363fa93b17007788a4299f8a7e41de62;hpb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 1f7064c8..54d0e339 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
 SR_PRIV int init_ascii(struct sr_output *o)
@@ -30,15 +30,15 @@ SR_PRIV int init_ascii(struct sr_output *o)
 	return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-SR_PRIV int data_ascii(struct sr_output *o, const char *data_in,
-		       uint64_t length_in, char **data_out,
+SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
+		       uint64_t length_in, uint8_t **data_out,
 		       uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
 	int max_linelen;
 	uint64_t sample;
-	char *outbuf;
+	uint8_t *outbuf;
 
 	ctx = o->internal;
 	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
@@ -58,7 +58,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const char *data_in,
 	outbuf[0] = '\0';
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
-		strncpy(outbuf, ctx->header, outsize);
+		strncpy((char *)outbuf, ctx->header, outsize);
 		g_free(ctx->header);
 		ctx->header = NULL;
 	}
@@ -113,14 +113,14 @@ SR_PRIV int data_ascii(struct sr_output *o, const char *data_in,
 	}
 
 	*data_out = outbuf;
-	*length_out = strlen(outbuf);
+	*length_out = strlen((const char *)outbuf);
 
 	return SR_OK;
 }
 
 SR_PRIV struct sr_output_format output_text_ascii = {
 	.id = "ascii",
-	.description = "ASCII (takes argument, default 74)",
+	.description = "ASCII",
 	.df_type = SR_DF_LOGIC,
 	.init = init_ascii,
 	.data = data_ascii,