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";
if (!ch->enabled)
continue;
+ s = NULL;
switch (ch->type) {
case SR_CHANNEL_LOGIC:
s = g_strdup_printf("probe%d", ch->index + 1);
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);
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));
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;
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;
}
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);
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,