input: Free instance-private storage at instance free.

[libsigrok.git] / src / input / csv.c

diff --git a/src/input/csv.c b/src/input/csv.c
index ece68a98102ccfe670d14660f84a5b72711bc218..fb284f86423f74aea6f43296df3e27713c2ed0f7 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -138,9 +138,9 @@ static int format_match(GHashTable *metadata)
 
        buf = g_hash_table_lookup(metadata, GINT_TO_POINTER(SR_INPUT_META_MIMETYPE));
        if (!strcmp(buf, "text/csv"))
-               return TRUE;
+               return SR_OK;
 
-       return FALSE;
+       return SR_ERR;
 }
 
 static void strip_comment(char *buf, const GString *prefix)
@@ -393,7 +393,7 @@ static int init(struct sr_input *in, GHashTable *options)
        struct context *inc;
        const char *s;
 
-       in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
+       in->sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
        in->priv = inc = g_malloc0(sizeof(struct context));
 
        inc->single_column = g_variant_get_int32(g_hash_table_lookup(options, "single-column"));
@@ -429,11 +429,7 @@ static int init(struct sr_input *in, GHashTable *options)
                g_string_truncate(inc->comment, 0);
        }
 
-       s = g_variant_get_string(g_hash_table_lookup(options, "samplerate"), NULL);
-       if (sr_parse_sizestring(s, &inc->samplerate) != SR_OK) {
-               sr_err("Invalid samplerate '%s'.", s);
-               return SR_ERR_ARG;
-       }
+       inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
 
        inc->first_channel = g_variant_get_int32(g_hash_table_lookup(options, "first-channel"));
 
@@ -593,11 +589,11 @@ static int initial_receive(const struct sr_input *in)
 
        if (!(termination = get_line_termination(in->buf)))
                /* Don't have a full line yet. */
-               return SR_OK_CONTINUE;
+               return SR_ERR_NA;
 
        if (!(p = g_strrstr_len(in->buf->str, in->buf->len, termination)))
                /* Don't have a full line yet. */
-               return SR_OK_CONTINUE;
+               return SR_ERR_NA;
        len = p - in->buf->str - 1;
        new_buf = g_string_new_len(in->buf->str, len);
        g_string_append_c(new_buf, '\0');
@@ -614,7 +610,7 @@ static int initial_receive(const struct sr_input *in)
        return ret;
 }
 
-static int receive(const struct sr_input *in, GString *buf)
+static int receive(struct sr_input *in, GString *buf)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_meta meta;
@@ -629,14 +625,18 @@ static int receive(const struct sr_input *in, GString *buf)
 
        inc = in->priv;
        if (!inc->termination) {
-               ret = initial_receive(in);
-               if (ret == SR_OK_CONTINUE)
+               if ((ret = initial_receive(in)) == SR_ERR_NA)
                        /* Not enough data yet. */
-                       return SR_OK_CONTINUE;
+                       return SR_OK;
                else if (ret != SR_OK)
                        return SR_ERR;
 
-               inc->started = TRUE;
+               /* sdi is ready, notify frontend. */
+               in->sdi_ready = TRUE;
+               return SR_OK;
+       }
+
+       if (!inc->started) {
                std_session_send_df_header(in->sdi, LOG_PREFIX);
 
                if (inc->samplerate) {
@@ -648,6 +648,8 @@ static int receive(const struct sr_input *in, GString *buf)
                        sr_session_send(in->sdi, &packet);
                        sr_config_free(src);
                }
+
+               inc->started = TRUE;
        }
 
        if (!(p = g_strrstr_len(in->buf->str, in->buf->len, inc->termination)))
@@ -751,9 +753,6 @@ static int cleanup(struct sr_input *in)
        if (inc->sample_buffer)
                g_free(inc->sample_buffer);
 
-       g_free(inc);
-       in->priv = NULL;
-
        return SR_OK;
 }
 
@@ -767,7 +766,7 @@ static struct sr_option options[] = {
        { "first-channel", "First channel", "Column number of first channel", NULL, NULL },
        { "header", "Header", "Treat first line as header with channel names", NULL, NULL },
        { "startline", "Start line", "Line number at which to start processing samples", NULL, NULL },
-       { 0 }
+       ALL_ZERO
 };
 
 static struct sr_option *get_options(void)
@@ -778,7 +777,7 @@ static struct sr_option *get_options(void)
                options[2].def = g_variant_ref_sink(g_variant_new_string(","));
                options[3].def = g_variant_ref_sink(g_variant_new_string("bin"));
                options[4].def = g_variant_ref_sink(g_variant_new_string(";"));
-               options[5].def = g_variant_ref_sink(g_variant_new_string("0"));
+               options[5].def = g_variant_ref_sink(g_variant_new_uint64(0));
                options[6].def = g_variant_ref_sink(g_variant_new_int32(0));
                options[7].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
                options[8].def = g_variant_ref_sink(g_variant_new_int32(1));