X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fcsv.c;h=fa1d51fd05a787ca7a7241f263308d2f9170137e;hb=492dfa90255e95b143b7a0ba9c78b6e022e7b115;hp=db6f46767e9688a5eb8c4483f1d693f00a9c6542;hpb=df0db9fdda408ef7623c10b8daa0019f8f206bdf;p=libsigrok.git diff --git a/src/input/csv.c b/src/input/csv.c index db6f4676..fa1d51fd 100644 --- 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]; @@ -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];