input/csv: Re-order processing steps (column mode vs text line split)

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

diff --git a/src/input/csv.c b/src/input/csv.c
index db6f46767e9688a5eb8c4483f1d693f00a9c6542..5585b0eeacc07247aca5a34056d475cbf4c4a298 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -447,6 +447,8 @@ static int init(struct sr_input *in, GHashTable *options)
        return SR_OK;
 }
 
+static const char *delim_set = "\r\n";
+
 static const char *get_line_termination(GString *buf)
 {
        const char *term;
@@ -476,7 +478,7 @@ static int initial_parse(const struct sr_input *in, GString *buf)
        columns = NULL;
 
        line_number = 0;
-       lines = g_strsplit_set(buf->str, "\r\n", 0);
+       lines = g_strsplit_set(buf->str, delim_set, 0);
        for (l = 0; lines[l]; l++) {
                line_number++;
                line = lines[l];
@@ -636,6 +638,12 @@ static int process_buffer(struct sr_input *in)
                inc->started = TRUE;
        }
 
+       /* Limit the number of columns to parse. */
+       if (inc->multi_column_mode)
+               max_columns = inc->num_channels;
+       else
+               max_columns = 1;
+
        p = g_strrstr_len(in->buf->str, in->buf->len, inc->termination);
        if (!p)
                /* Don't have a full line. */
@@ -644,14 +652,8 @@ static int process_buffer(struct sr_input *in)
        *p = '\0';
        g_strstrip(in->buf->str);
 
-       /* Limit the number of columns to parse. */
-       if (inc->multi_column_mode)
-               max_columns = inc->num_channels;
-       else
-               max_columns = 1;
-
        ret = SR_OK;
-       lines = g_strsplit_set(in->buf->str, "\r\n", 0);
+       lines = g_strsplit_set(in->buf->str, delim_set, 0);
        for (l = 0; lines[l]; l++) {
                inc->line_number++;
                line = lines[l];