X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=c48743218991f3c533b99e25237c23b8a96ae43b;hb=4ca38984459adfeaf6a94c2163be855fe41aec59;hp=29740656c839e3d1dccd362317c99d9a7f74ab87;hpb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95;p=libsigrok.git

diff --git a/output/text/text.c b/output/text/text.c
index 29740656..c4874321 100644
--- a/output/text/text.c
+++ b/output/text/text.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
@@ -23,10 +23,11 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h"
-#include "sigrok.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
-SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
+SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
 {
 	static int max_probename_len = 0;
 	int len, i;
@@ -44,7 +45,8 @@ SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
 	}
 
 	for (i = 0; ctx->probelist[i]; i++) {
-		sprintf(outbuf + strlen(outbuf), "%*s:%s\n", max_probename_len,
+		sprintf((char *)outbuf + strlen((const char *)outbuf),
+			"%*s:%s\n", max_probename_len,
 			ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len);
 	}
 
@@ -56,8 +58,8 @@ SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
 		if (ctx->mode == MODE_ASCII)
 			space_offset = 0;
 
-		sprintf(outbuf + strlen(outbuf), "T:%*s^\n",
-			ctx->mark_trigger + space_offset, "");
+		sprintf((char *)outbuf + strlen((const char *)outbuf),
+			"T:%*s^\n", ctx->mark_trigger + space_offset, "");
 	}
 
 	memset(ctx->linebuf, 0, i * ctx->linebuf_len);
@@ -72,13 +74,15 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 	int num_probes;
 	char *samplerate_s;
 
-	if (!(ctx = calloc(1, sizeof(struct context))))
+	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+		sr_err("text out: %s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
+	}
 
 	o->internal = ctx;
 	ctx->num_enabled_probes = 0;
 
-	for (l = o->device->probes; l; l = l->next) {
+	for (l = o->dev->probes; l; l = l->next) {
 		probe = l->data;
 		if (!probe->enabled)
 			continue;
@@ -99,49 +103,52 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 	} else
 		ctx->samples_per_line = default_spl;
 
-	if (!(ctx->header = malloc(512))) {
-		free(ctx);
+	if (!(ctx->header = g_try_malloc0(512))) {
+		g_free(ctx);
+		sr_err("text out: %s: ctx->header malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
 	snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
-	num_probes = g_slist_length(o->device->probes);
-	if (o->device->plugin || sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+	num_probes = g_slist_length(o->dev->probes);
+	if (o->dev->driver || sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
+		samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+				o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
 		if (!(samplerate_s = sr_samplerate_string(samplerate))) {
-			free(ctx->header);
-			free(ctx);
+			g_free(ctx->header);
+			g_free(ctx);
 			return SR_ERR;
 		}
 		snprintf(ctx->header + strlen(ctx->header),
 			 511 - strlen(ctx->header),
 			 "Acquisition with %d/%d probes at %s\n",
 			 ctx->num_enabled_probes, num_probes, samplerate_s);
-		free(samplerate_s);
+		g_free(samplerate_s);
 	}
 
 	ctx->linebuf_len = ctx->samples_per_line * 2 + 4;
-	if (!(ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len))) {
-		free(ctx->header);
-		free(ctx);
+	if (!(ctx->linebuf = g_try_malloc0(num_probes * ctx->linebuf_len))) {
+		g_free(ctx->header);
+		g_free(ctx);
+		sr_err("text out: %s: ctx->linebuf malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
-	if (!(ctx->linevalues = calloc(1, num_probes))) {
-		free(ctx->header);
-		free(ctx);
+	if (!(ctx->linevalues = g_try_malloc0(num_probes))) {
+		g_free(ctx->header);
+		g_free(ctx);
+		sr_err("text out: %s: ctx->linevalues malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
 	return SR_OK;
 }
 
-SR_PRIV int event(struct sr_output *o, int event_type, char **data_out,
+SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
 		  uint64_t *length_out)
 {
 	struct context *ctx;
 	int outsize;
-	char *outbuf;
+	uint8_t *outbuf;
 
 	ctx = o->internal;
 	switch (event_type) {
@@ -153,12 +160,14 @@ SR_PRIV int event(struct sr_output *o, int event_type, char **data_out,
 	case SR_DF_END:
 		outsize = ctx->num_enabled_probes
 				* (ctx->samples_per_line + 20) + 512;
-		if (!(outbuf = calloc(1, outsize)))
+		if (!(outbuf = g_try_malloc0(outsize))) {
+			sr_err("text out: %s: outbuf malloc failed", __func__);
 			return SR_ERR_MALLOC;
+		}
 		flush_linebufs(ctx, outbuf);
 		*data_out = outbuf;
-		*length_out = strlen(outbuf);
-		free(o->internal);
+		*length_out = strlen((const char *)outbuf);
+		g_free(o->internal);
 		o->internal = NULL;
 		break;
 	default: