Minor cosmetics.

[libsigrok.git] / src / output / srzip.c

diff --git a/src/output/srzip.c b/src/output/srzip.c
index bfc42b21a51b9002b9ee8f025f13000d27ecb5a8..249fe057994aeeaf80b9106ae3b041a8c1fb7b5e 100644 (file)
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -260,8 +260,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));
@@ -324,14 +327,6 @@ static int zip_append_analog(const struct sr_output *o,
        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) {
@@ -347,10 +342,18 @@ 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;
 
+       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;
@@ -368,9 +371,10 @@ static int zip_append_analog(const struct sr_output *o,
 
        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);
@@ -379,16 +383,26 @@ static int zip_append_analog(const struct sr_output *o,
        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,