output: simplify trigger marker position calculation (readability)

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

diff --git a/src/output/srzip.c b/src/output/srzip.c
index 84938ad2b741f431117c0a433bf782ed5a9c241f..93c43d32eb87bd02e16de1ad21a2673684dc7150 100644 (file)
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -150,6 +150,7 @@ static int zip_create(const struct sr_output *o)
                if (!ch->enabled)
                        continue;
 
+               s = NULL;
                switch (ch->type) {
                case SR_CHANNEL_LOGIC:
                        s = g_strdup_printf("probe%d", ch->index + 1);
@@ -160,8 +161,10 @@ static int zip_create(const struct sr_output *o)
                        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);
@@ -484,7 +487,7 @@ static int cleanup(struct sr_output *o)
 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,