X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=cfe3bfb9e7a34943960c919b9f8cbff1ab69fcdc;hb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;hp=39f12134988017ed37953de44b5433f093362612;hpb=97554432e8d8bcf7f5af2dd770bcf752c9cd7d75;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index 39f12134..cfe3bfb9 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -21,17 +21,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "text.h"
 
-
-int init_hex(struct output *o)
+SR_PRIV int init_hex(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct output *o, char *data_in, uint64_t length_in,
-		    char **data_out, uint64_t *length_out)
+SR_PRIV int data_hex(struct sr_output *o, const char *data_in,
+		     uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -40,19 +40,21 @@ int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 2;
 	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
 			/ ctx->samples_per_line * max_linelen + 512;
 
-	if (!(outbuf = calloc(1, outsize + 1)))
-		return SIGROK_ERR_MALLOC;
+	if (!(outbuf = g_try_malloc0(outsize + 1))) {
+		sr_err("hex out: %s: outbuf malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
 		strncpy(outbuf, ctx->header, outsize);
-		free(ctx->header);
+		g_free(ctx->header);
 		ctx->header = NULL;
 	}
 
@@ -87,16 +89,14 @@ int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	*data_out = outbuf;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-
-struct output_format output_text_hex = {
-	"hex",
-	"Hexadecimal (takes argument, default 192)",
-	DF_LOGIC,
-	init_hex,
-	data_hex,
-	event,
+SR_PRIV struct sr_output_format output_text_hex = {
+	.id = "hex",
+	.description = "Hexadecimal (takes argument, default 192)",
+	.df_type = SR_DF_LOGIC,
+	.init = init_hex,
+	.data = data_hex,
+	.event = event,
 };
-