g_key_file_set_integer(meta, devgroup, "total analog", enabled_analog_channels);
/* Make the array one entry larger than needed so we can use the final
- * 0 as terminator. */
+ * entry as terminator, which is set to -1. */
outc->analog_index_map = g_malloc0(sizeof(gint) * (enabled_analog_channels + 1));
+ outc->analog_index_map[enabled_analog_channels] = -1;
index = 0;
for (l = o->sdi->channels; l; l = l->next) {
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) {
/* When reading the file, analog channels must be consecutive.
* Thus we need a global channel index map as we don't know in
* which order the channel data comes in. */
- for (index = 0; outc->analog_index_map[index]; index++)
+ for (index = 0; outc->analog_index_map[index] != -1; index++)
if (outc->analog_index_map[index] == channel->index)
break;
- if (!outc->analog_index_map[index])
+ if (outc->analog_index_map[index] == -1)
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);
if (i < 0) {
sr_err("Failed to add chunk '%s': %s", chunkname, zip_strerror(archive));
zip_source_free(analogsrc);
- zip_discard(archive);
- return SR_ERR;
+ goto err_free_chunkbuf;
}
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,