X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=fb5ca0073dc4dbddf9279b787b3728ad2aaeedb2;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=e4806355b371b6519f93cf7e296388dece019669;hpb=d494a4aa9dcbd90126d86757d16fa3e0f0a419f3;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index e4806355..fb5ca007 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok 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,16 +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 sr_output *o)
+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 char *data_in,
+		     uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -44,14 +45,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("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;
 	}
 
@@ -89,8 +92,8 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-struct sr_output_format output_text_hex = {
-	.extension = "hex",
+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,