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

input/csv: Concentrate text line encoding in a single spot 

Factor out a magic string literal which held a delimiter set yet could
be mistaken for an (assumed) fixed termination string. Concentrate the
determination of the end-of-line text encoding as well as the resulting
set of possible deliminters in one nearby location. The symbolic name
for the delimiter set eliminates the doubt on its purpose.
This commit is contained in:
Gerhard Sittig 2017-06-05 13:09:16 +02:00 committed by Uwe Hermann
parent df0db9fdda
commit 492dfa9025
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input/csv.c
View File

@ -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];
@ -651,7 +653,7 @@ static int process_buffer(struct sr_input *in)
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];