output: Use sr_config_get() wrapper

[libsigrok.git] / output / gnuplot.c

diff --git a/output/gnuplot.c b/output/gnuplot.c
index e2655ff1b73b4ae10f83744936210c62435d1c0f..9e1f2af6c3e4e081278c828e6a6099e85557472a 100644 (file)
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -37,14 +37,10 @@
 struct context {
        unsigned int num_enabled_probes;
        unsigned int unitsize;
-       char *probelist[SR_MAX_NUM_PROBES + 1];
        char *header;
        uint8_t *old_sample;
 };
 
-#define MAX_HEADER_LEN \
-       (1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10)))
-
 static const char *gnuplot_header = "\
 # Sample data in space-separated columns format usable by gnuplot\n\
 #\n\
@@ -67,7 +63,7 @@ static int init(struct sr_output *o)
        GVariant *gvar;
        uint64_t samplerate;
        unsigned int i;
-       int b, num_probes;
+       int num_probes;
        char *c, *frequency_s;
        char wbuf[1000], comment[128];
        time_t t;
@@ -82,79 +78,58 @@ static int init(struct sr_output *o)
                return SR_ERR_ARG;
        }
 
-       if (!o->sdi->driver) {
-               sr_err("%s: o->sdi->driver was NULL", __func__);
-               return SR_ERR_ARG;
-       }
-
        if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
                sr_err("%s: ctx malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
-       if (!(ctx->header = g_try_malloc0(MAX_HEADER_LEN + 1))) {
-               sr_err("%s: ctx->header malloc failed", __func__);
-               g_free(ctx);
-               return SR_ERR_MALLOC;
-       }
-
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
        for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
-               if (!probe->enabled)
-                       continue;
-               ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+               if (probe->enabled)
+                       ctx->num_enabled_probes++;
        }
-       ctx->probelist[ctx->num_enabled_probes] = 0;
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
        num_probes = g_slist_length(o->sdi->probes);
        comment[0] = '\0';
        samplerate = 0;
-       if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-               o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
+                       o->sdi) == SR_OK) {
                samplerate = g_variant_get_uint64(gvar);
+               g_variant_unref(gvar);
                if (!(frequency_s = sr_samplerate_string(samplerate))) {
                        sr_err("%s: sr_samplerate_string failed", __func__);
-                       g_free(ctx->header);
                        g_free(ctx);
-                       g_variant_unref(gvar);
                        return SR_ERR;
                }
                snprintf(comment, 127, gnuplot_header_comment,
                        ctx->num_enabled_probes, num_probes, frequency_s);
                g_free(frequency_s);
-               g_variant_unref(gvar);
        }
 
        /* Columns / channels */
        wbuf[0] = '\0';
-       for (i = 0; i < ctx->num_enabled_probes; i++) {
+       for (i = 0, l = o->sdi->probes; l; l = l->next, i++) {
+               probe = l->data;
+               if (!probe->enabled)
+                       continue;
                c = (char *)&wbuf + strlen((const char *)&wbuf);
-               sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
+               sprintf(c, "# %d\t\t%s\n", i + 1, probe->name);
        }
 
        if (!(frequency_s = sr_period_string(samplerate))) {
                sr_err("%s: sr_period_string failed", __func__);
-               g_free(ctx->header);
                g_free(ctx);
                return SR_ERR;
        }
 
        t = time(NULL);
-       b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
-                    PACKAGE_STRING, ctime(&t), comment, frequency_s,
-                    (char *)&wbuf);
+       ctx->header = g_strdup_printf(gnuplot_header, PACKAGE_STRING,
+                       ctime(&t), comment, frequency_s, (char *)&wbuf);
        g_free(frequency_s);
 
-       if (b < 0) {
-               sr_err("%s: sprintf failed", __func__);
-               g_free(ctx->header);
-               g_free(ctx);
-               return SR_ERR;
-       }
-
        if (!(ctx->old_sample = g_try_malloc0(ctx->unitsize))) {
                sr_err("%s: ctx->old_sample malloc failed", __func__);
                g_free(ctx->header);