From: Gerhard Sittig <redacted>
Date: Sun, 13 Oct 2019 14:28:39 +0000 (+0200)
Subject: input/csv: trim whitespace after eliminating comments
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b2c4dde226467e0c3a14d14370efcdeb54c089a2;p=libsigrok.git

input/csv: trim whitespace after eliminating comments

Accept when comments are indented, trim the whitespace from text lines
after stripping off the comment. This avoids the processing of lines
which actually are empty, and improves robustness (avoids errors for a
non-fatal situation). Also results in more appropriate diagnostics at
higher log levels.
---

diff --git a/src/input/csv.c b/src/input/csv.c
index b8574d3e..b1645e73 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -181,8 +181,10 @@ static void strip_comment(char *buf, const GString *prefix)
 	if (!prefix->len)
 		return;
 
-	if ((ptr = strstr(buf, prefix->str)))
+	if ((ptr = strstr(buf, prefix->str))) {
 		*ptr = '\0';
+		g_strstrip(buf);
+	}
 }
 
 static int parse_binstr(const char *str, struct context *inc)