From: Bert Vermeulen <redacted>
Date: Thu, 6 May 2010 05:06:38 +0000 (-0700)
Subject: output_text: always print sigrok version
X-Git-Tag: libsigrok-0.1.0~520
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=d2b36a10d72133feeea3610bdc81a484b6f8fc72;p=libsigrok.git

output_text: always print sigrok version
---

diff --git a/output/output_text.c b/output/output_text.c
index 05a368f0..fe212dfa 100644
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include "config.h"
 
 #define DEFAULT_BPL_BITS 64
 #define DEFAULT_BPL_HEX  256
@@ -100,24 +101,18 @@ static int init(struct output *o, int default_spl)
 	else
 		ctx->samples_per_line = default_spl;
 
+	ctx->header = malloc(512);
+	snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
 	if (o->device->plugin) {
-		ctx->header = malloc(512);
 		num_probes = g_slist_length(o->device->probes);
 		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
 				o->device->plugin_index, DI_CUR_SAMPLERATE));
-		snprintf(ctx->header, 512, "Acquisition with %d/%d probes at ",
-			 ctx->num_enabled_probes, num_probes);
-
 		if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL)
-			return -1; /* FIXME */
-		snprintf(ctx->header + strlen(ctx->header), 512, "%s\n", samplerate_s);
+			return SIGROK_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);
-	} else {
-		/*
-		 * device has no plugin: this is just a dummy device, the data
-		 * comes from a file.
-		 */
-		ctx->header = NULL;
 	}
 
 	ctx->linebuf_len = ctx->samples_per_line * 2;