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);
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);