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));
unsigned int next_chunk_num, index;
outc = o->priv;
- if (!(archive = zip_open(outc->filename, 0, NULL)))
- return SR_ERR;
-
- if (zip_stat(archive, "metadata", 0, &zs) < 0) {
- sr_err("Failed to open metadata: %s", zip_strerror(archive));
- zip_discard(archive);
- return SR_ERR;
- }
/* TODO: support packets covering multiple channels */
if (g_slist_length(analog->meaning->channels) != 1) {
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;
+ if (!(archive = zip_open(outc->filename, 0, NULL)))
+ return SR_ERR;
+
+ if (zip_stat(archive, "metadata", 0, &zs) < 0) {
+ sr_err("Failed to open metadata: %s", zip_strerror(archive));
+ goto err_zip_discard;
+ }
+
basename = g_strdup_printf("analog-1-%u", index);
baselen = strlen(basename);
next_chunk_num = 1;
chunksize = sizeof(float) * analog->num_samples;
if (!(chunkbuf = g_try_malloc(chunksize)))
- return SR_ERR;
+ goto err_free_basename;
+
if (sr_analog_to_float(analog, chunkbuf) != SR_OK)
- return SR_ERR;
+ goto err_free_chunkbuf;
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);
- zip_discard(archive);
- return SR_ERR;
+ goto err_free_chunkbuf;
}
+ g_free(chunkname);
if (zip_close(archive) < 0) {
sr_err("Error saving session file: %s", zip_strerror(archive));
- zip_discard(archive);
- return SR_ERR;
+ goto err_free_chunkbuf;
}
+ g_free(basename);
+ g_free(chunkbuf);
+
return SR_OK;
+
+err_free_chunkbuf:
+ g_free(chunkbuf);
+err_free_basename:
+ g_free(basename);
+err_zip_discard:
+ zip_discard(archive);
+
+ return SR_ERR;
}
static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
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);