X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fsrzip.c;h=0c5ebf684a6c83ab471e01fe53c43f0e1af695ea;hb=4b3197828d53587db7111e275390cc4857c2fdae;hp=b554558534a3587bf81d99d4e691f5b3ad03cc6e;hpb=7e2f42214a72bb3ad2b4ce1767ff8945fa83fe97;p=libsigrok.git

diff --git a/src/output/srzip.c b/src/output/srzip.c
index b5545585..0c5ebf68 100644
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -99,7 +99,7 @@ static int zip_create(const struct sr_output *o)
 	meta = g_key_file_new();
 
 	g_key_file_set_string(meta, "global", "sigrok version",
-			SR_PACKAGE_VERSION_STRING);
+			sr_package_version_string_get());
 
 	devgroup = "device 1";
 
@@ -150,6 +150,7 @@ static int zip_create(const struct sr_output *o)
 		if (!ch->enabled)
 			continue;
 
+		s = NULL;
 		switch (ch->type) {
 		case SR_CHANNEL_LOGIC:
 			s = g_strdup_printf("probe%d", ch->index + 1);
@@ -160,8 +161,10 @@ static int zip_create(const struct sr_output *o)
 			index++;
 			break;
 		}
-		g_key_file_set_string(meta, devgroup, s, ch->name);
-		g_free(s);
+		if (s) {
+			g_key_file_set_string(meta, devgroup, s, ch->name);
+			g_free(s);
+		}
 	}
 
 	metabuf = g_key_file_to_data(meta, &metalen, NULL);
@@ -260,8 +263,11 @@ static int zip_append(const struct sr_output *o, unsigned char *buf,
 		if (!entry_name || strncmp(entry_name, "logic-1", 7) != 0)
 			continue;
 		if (entry_name[7] == '\0') {
-			/* This file has no extra chunks, just a single "logic-1".
-			 * Rename it to "logic-1-1" * and continue with chunk 2. */
+			/*
+			 * This file has no extra chunks, just a single
+			 * "logic-1". Rename it to "logic-1-1" and continue
+			 * with chunk 2.
+			 */
 			if (zip_rename(archive, i, "logic-1-1") < 0) {
 				sr_err("Failed to rename 'logic-1' to 'logic-1-1': %s",
 					zip_strerror(archive));
@@ -339,7 +345,7 @@ static int zip_append_analog(const struct sr_output *o,
 		if (outc->analog_index_map[index] == channel->index)
 			break;
 	if (outc->analog_index_map[index] == -1)
-		return SR_ERR_ARG;  /* Channel index was not in the list */
+		return SR_ERR_ARG; /* Channel index was not in the list */
 
 	index += outc->first_analog_index;
 
@@ -376,12 +382,13 @@ static int zip_append_analog(const struct sr_output *o,
 	analogsrc = zip_source_buffer(archive, chunkbuf, chunksize, FALSE);
 	chunkname = g_strdup_printf("%s-%u", basename, next_chunk_num);
 	i = zip_add(archive, chunkname, analogsrc);
-	g_free(chunkname);
 	if (i < 0) {
 		sr_err("Failed to add chunk '%s': %s", chunkname, zip_strerror(archive));
+		g_free(chunkname);
 		zip_source_free(analogsrc);
 		goto err_free_chunkbuf;
 	}
+	g_free(chunkname);
 	if (zip_close(archive) < 0) {
 		sr_err("Error saving session file: %s", zip_strerror(archive));
 		goto err_free_chunkbuf;
@@ -461,9 +468,6 @@ static struct sr_option options[] = {
 
 static const struct sr_option *get_options(void)
 {
-	if (!options[0].def)
-		options[0].def = g_variant_ref_sink(g_variant_new_string(""));
-
 	return options;
 }
 
@@ -472,7 +476,6 @@ static int cleanup(struct sr_output *o)
 	struct out_context *outc;
 
 	outc = o->priv;
-	g_variant_unref(options[0].def);
 	g_free(outc->analog_index_map);
 	g_free(outc->filename);
 	g_free(outc);
@@ -484,7 +487,7 @@ static int cleanup(struct sr_output *o)
 SR_PRIV struct sr_output_module output_srzip = {
 	.id = "srzip",
 	.name = "srzip",
-	.desc = "srzip session file",
+	.desc = "srzip session file format data",
 	.exts = (const char*[]){"sr", NULL},
 	.flags = SR_OUTPUT_INTERNAL_IO_HANDLING,
 	.options = get_options,