BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Move an independent test for single/multi column operation out of a code
path that checked for and then processed text lines. This commit does
not change behaviour, but prepares a subsequent commit.
This commit is contained in:
Gerhard Sittig 2017-06-05 13:34:05 +02:00 committed by Uwe Hermann
parent 492dfa9025
commit f9b7486154
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/input/csv.c
View File

@ -638,6 +638,12 @@ static int process_buffer(struct sr_input *in)
inc->started = TRUE; 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); p = g_strrstr_len(in->buf->str, in->buf->len, inc->termination);
if (!p) if (!p)
/* Don't have a full line. */ /* Don't have a full line. */
@ -646,12 +652,6 @@ static int process_buffer(struct sr_input *in)
*p = '\0'; *p = '\0';
g_strstrip(in->buf->str); 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; ret = SR_OK;
lines = g_strsplit_set(in->buf->str, delim_set, 0); lines = g_strsplit_set(in->buf->str, delim_set, 0);
for (l = 0; lines[l]; l++) { for (l = 0; lines[l]; l++) {