X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=f1529860a9f430035ab5e488ff40bb637f784de3;hb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;hp=e604d9735f76a04ae2ec1b5270b5128c50b66f8f;hpb=cdb3573ceba61b02b80f7fc979d166db5b6ff3bc;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index e604d973..f1529860 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2011 HÃ¥vard Espeland <gus@ping.uio.no>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,22 +21,33 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
-int init_hex(struct sr_output *o)
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "output/hex: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
+SR_PRIV int init_hex(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
-	     char **data_out, uint64_t *length_out)
+SR_PRIV int data_hex(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
@@ -44,14 +55,16 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
 	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
 			/ ctx->samples_per_line * max_linelen + 512;
 
-	if (!(outbuf = calloc(1, outsize + 1)))
+	if (!(outbuf = g_try_malloc0(outsize + 1))) {
+		sr_err("%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);
+		strncpy((char *)outbuf, ctx->header, outsize);
+		g_free(ctx->header);
 		ctx->header = NULL;
 	}
 
@@ -63,7 +76,7 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
 			ctx->linevalues[p] <<= 1;
 			if (sample & ((uint64_t) 1 << p))
 				ctx->linevalues[p] |= 1;
-			sprintf(ctx->linebuf + (p * ctx->linebuf_len) +
+			sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) +
 				ctx->line_offset, "%.2x", ctx->linevalues[p]);
 		}
 		ctx->spl_cnt++;
@@ -84,14 +97,14 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
 	}
 
 	*data_out = outbuf;
-	*length_out = strlen(outbuf);
+	*length_out = strlen((const char *)outbuf);
 
 	return SR_OK;
 }
 
-struct sr_output_format output_text_hex = {
+SR_PRIV struct sr_output_format output_text_hex = {
 	.id = "hex",
-	.description = "Hexadecimal (takes argument, default 192)",
+	.description = "Hexadecimal",
 	.df_type = SR_DF_LOGIC,
 	.init = init_hex,
 	.data = data_hex,