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

input/csv: trim surrounding whitespace from header line channel names 

When CSV import grabs channel names from the first line in the file then
the text strictly between column separators (a comma) was used. Which
resulted in channel names like " channel 1". Trim leading and trailing
space before unquote, to better fulfill most users' expectation. Users
still can quote the input data for special cases if desired.
This commit is contained in:
Gerhard Sittig 2020-01-06 09:59:21 +01:00
parent 7a78fd56f7
commit 4b8348941d
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

@ -657,10 +657,12 @@ static int make_column_details_from_format(const struct sr_input *in,
* line won't get processed another time. * line won't get processed another time.
*/ */
column = column_texts[detail->col_nr - 1]; column = column_texts[detail->col_nr - 1];
if (inc->use_header && column && *column) if (inc->use_header && column && *column) {
column = g_strstrip(column);
caption = sr_scpi_unquote_string(column); caption = sr_scpi_unquote_string(column);
else } else {
caption = NULL; caption = NULL;
}
if (!caption || !*caption) if (!caption || !*caption)
caption = NULL; caption = NULL;
/* /*