Constify a few arrays and variables.

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

diff --git a/src/input/csv.c b/src/input/csv.c
index 68ab43b806de03c0dfc7d5be5e9e1bee6e5978a1..0e68e39156f884eb20d2dd14bbead33c1f724b84 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -454,9 +454,9 @@ static int init(struct sr_input *in, GHashTable *options)
        return SR_OK;
 }
 
-static char *get_line_termination(GString *buf)
+static const char *get_line_termination(GString *buf)
 {
-       char *term;
+       const char *term;
 
        term = NULL;
        if (g_strstr_len(buf->str, buf->len, "\r\n"))
@@ -472,7 +472,6 @@ static char *get_line_termination(GString *buf)
 static int initial_parse(const struct sr_input *in, GString *buf)
 {
        struct context *inc;
-       struct sr_channel *ch;
        GString *channel_name;
        gsize num_columns, l, i;
        unsigned int line_number;
@@ -558,8 +557,7 @@ static int initial_parse(const struct sr_input *in, GString *buf)
                        g_string_assign(channel_name, columns[i]);
                else
                        g_string_printf(channel_name, "%zu", i);
-               ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name->str);
-               in->sdi->channels = g_slist_append(in->sdi->channels, ch);
+               sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name->str);
        }
        g_string_free(channel_name, TRUE);
 
@@ -583,7 +581,8 @@ static int initial_receive(const struct sr_input *in)
        struct context *inc;
        GString *new_buf;
        int len, ret;
-       char *termination, *p;
+       char *p;
+       const char *termination;
 
        inc = in->priv;
 
@@ -819,6 +818,7 @@ SR_PRIV struct sr_input_module input_csv = {
        .id = "csv",
        .name = "CSV",
        .desc = "Comma-separated values",
+       .exts = (const char*[]){"csv", NULL},
        .metadata = { SR_INPUT_META_MIMETYPE },
        .options = get_options,
        .format_match = format_match,