X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fbits.c;h=c1dbd2f81502ca67cb185672cea75dc113eda35f;hb=4ca38984459adfeaf6a94c2163be855fe41aec59;hp=cc17a9290c1a6f0f4c6998949a4e9ac763eced5b;hpb=d494a4aa9dcbd90126d86757d16fa3e0f0a419f3;p=libsigrok.git

diff --git a/output/text/bits.c b/output/text/bits.c
index cc17a929..c1dbd2f8 100644
--- a/output/text/bits.c
+++ b/output/text/bits.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,22 +21,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
-int init_bits(struct sr_output *o)
+SR_PRIV int init_bits(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
-	      char **data_out, uint64_t *length_out)
+SR_PRIV int data_bits(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, c;
+	uint8_t *outbuf, c;
 
 	ctx = o->internal;
 	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
@@ -48,14 +50,16 @@ int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
 	outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line)
             * (ctx->num_enabled_probes * max_linelen);
 
-	if (!(outbuf = calloc(1, outsize + 1)))
+	if (!(outbuf = g_try_malloc0(outsize + 1))) {
+		sr_err("bits 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);
+		strncpy((char *)outbuf, ctx->header, outsize);
+		g_free(ctx->header);
 		ctx->header = NULL;
 
 		/* Ensure first transition. */
@@ -91,18 +95,19 @@ int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
 			}
 		}
 	} else {
-		g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+		sr_info("bits out: short buffer (length_in=%" PRIu64 ")",
+			length_in);
 	}
 
 	*data_out = outbuf;
-	*length_out = strlen(outbuf);
+	*length_out = strlen((const char *)outbuf);
 
 	return SR_OK;
 }
 
-struct sr_output_format output_text_bits = {
-	.extension = "bits",
-	.description = "Bits (takes argument, default 64)",
+SR_PRIV struct sr_output_format output_text_bits = {
+	.id = "bits",
+	.description = "Bits",
 	.df_type = SR_DF_LOGIC,
 	.init = init_bits,
 	.data = data_bits,