From: Soeren Apel <redacted>
Date: Wed, 29 Jul 2015 19:37:47 +0000 (+0200)
Subject: session: Supply filename to the output module directly
X-Git-Tag: sigrok-cli-0.6.0~26
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=5d7604d168152ce4c419928b20f0ccfeb669ebba;hp=54a3b8eedcf995e009e155f2fe29ceb26e6ff24a

session: Supply filename to the output module directly

This fixes parts of bug #570.
---

diff --git a/session.c b/session.c
index 9fa545e..b045119 100644
--- a/session.c
+++ b/session.c
@@ -25,7 +25,6 @@
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
-static char *srzip_and_filename = NULL;
 
 #ifdef HAVE_SRD
 extern struct srd_session *srd_sess;
@@ -81,17 +80,13 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 	const struct sr_option **options;
 	const struct sr_output *o;
 	GHashTable *fmtargs, *fmtopts;
-	int size;
 	char *fmtspec;
 
 	if (!opt_output_format) {
 		if (opt_output_file) {
-			size = strlen(opt_output_file) + 32;
-			srzip_and_filename = g_malloc(size);
-			snprintf(srzip_and_filename, size, "srzip:filename=%s", opt_output_file);
-			opt_output_format = srzip_and_filename;
+			opt_output_format = DEFAULT_OUTPUT_FORMAT_FILE;
 		} else {
-			opt_output_format = DEFAULT_OUTPUT_FORMAT;
+			opt_output_format = DEFAULT_OUTPUT_FORMAT_NOFILE;
 		}
 	}
 
@@ -107,7 +102,8 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 		sr_output_options_free(options);
 	} else
 		fmtopts = NULL;
-	o = sr_output_new(omod, fmtopts, sdi);
+	o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
+
 	if (fmtopts)
 		g_hash_table_destroy(fmtopts);
 	g_hash_table_destroy(fmtargs);
@@ -182,7 +178,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			g_critical("Failed to initialize output module.");
 
 		/* Set up backup analog output module. */
-		oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
+		oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
 
 		if (opt_output_file)
 			outfile = g_fopen(opt_output_file, "wb");
@@ -330,10 +326,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	if (packet->type == SR_DF_END) {
 		g_debug("cli: Received SR_DF_END.");
 
-		if (o) {
+		if (o)
 			sr_output_free(o);
-			g_free(srzip_and_filename);
-		}
 		o = NULL;
 
 		sr_output_free(oa);
diff --git a/sigrok-cli.h b/sigrok-cli.h
index f05a169..eaee7e6 100644
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -27,7 +27,8 @@
 #endif
 #include <libsigrok/libsigrok.h>
 
-#define DEFAULT_OUTPUT_FORMAT "bits:width=64"
+#define DEFAULT_OUTPUT_FORMAT_FILE "srzip"
+#define DEFAULT_OUTPUT_FORMAT_NOFILE "bits:width=64"
 #define SAVE_CHUNK_SIZE (512 * 1024)
 
 /* main.c */