X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fcsv.c;h=ed054e335450d7370d02f62eff2d62f054f7d1d3;hb=9eab4435f09234dfe7fbdcbab6a4a35298ed5393;hp=5957ed491533fcba4eac5363ad5e402850352bed;hpb=ad6a2beec33447fbf56e91588a7e22e4381f95a7;p=libsigrok.git

diff --git a/src/input/csv.c b/src/input/csv.c
index 5957ed49..ed054e33 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)
@@ -318,42 +320,39 @@ static char **parse_line(char *buf, struct context *inc, ssize_t max_cols)
 	GSList *list, *l;
 	char **columns;
 	char *column;
-	gsize n, k;
+	gsize seen, taken;
 
-	n = 0;
-	k = 0;
+	seen = 0;
+	taken = 0;
 	list = NULL;
 
 	remainder = buf;
 	str = strstr(remainder, inc->delimiter->str);
-
 	while (str && max_cols) {
-		if (n >= inc->first_column) {
+		if (seen >= inc->first_column) {
 			column = g_strndup(remainder, str - remainder);
 			list = g_slist_prepend(list, g_strstrip(column));
 
 			max_cols--;
-			k++;
+			taken++;
 		}
 
 		remainder = str + inc->delimiter->len;
 		str = strstr(remainder, inc->delimiter->str);
-		n++;
+		seen++;
 	}
 
-	if (buf[0] && max_cols && n >= inc->first_column) {
+	if (buf[0] && max_cols && seen >= inc->first_column) {
 		column = g_strdup(remainder);
 		list = g_slist_prepend(list, g_strstrip(column));
-		k++;
+		taken++;
 	}
 
-	if (!(columns = g_try_new(char *, k + 1)))
+	if (!(columns = g_try_new(char *, taken + 1)))
 		return NULL;
-
-	columns[k--] = NULL;
-
+	columns[taken--] = NULL;
 	for (l = list; l; l = l->next)
-		columns[k--] = l->data;
+		columns[taken--] = l->data;
 
 	g_slist_free(list);
 
@@ -965,17 +964,30 @@ static int reset(struct sr_input *in)
 	return SR_OK;
 }
 
+enum option_index {
+	OPT_SINGLE_COL,
+	OPT_NUM_LOGIC,
+	OPT_DELIM,
+	OPT_FORMAT,
+	OPT_COMMENT,
+	OPT_RATE,
+	OPT_FIRST_LOGIC,
+	OPT_HEADER,
+	OPT_START,
+	OPT_MAX,
+};
+
 static struct sr_option options[] = {
-	{ "single-column", "Single column", "Enable single-column mode, using the specified column (>= 1); 0: multi-col. mode", NULL, NULL },
-	{ "numchannels", "Number of logic channels", "The number of (logic) channels (single-col. mode: number of bits beginning at 'first channel', LSB-first)", NULL, NULL },
-	{ "delimiter", "Column delimiter", "The column delimiter (>= 1 characters)", NULL, NULL },
-	{ "format", "Data format (single-col. mode)", "The numeric format of the data (single-col. mode): bin, hex, oct", NULL, NULL },
-	{ "comment", "Comment character(s)", "The comment prefix character(s)", NULL, NULL },
-	{ "samplerate", "Samplerate (Hz)", "The sample rate (used during capture) in Hz", NULL, NULL },
-	{ "first-channel", "First channel", "The column number of the first channel (multi-col. mode); bit position for the first channel (single-col. mode)", NULL, NULL },
-	{ "header", "Interpret first line as header (multi-col. mode)", "Treat the first line as header with channel names (multi-col. mode)", NULL, NULL },
-	{ "startline", "Start line", "The line number at which to start processing samples (>= 1)", NULL, NULL },
-	ALL_ZERO
+	[OPT_SINGLE_COL] = { "single-column", "Single column", "Enable single-column mode, using the specified column (>= 1); 0: multi-col. mode", NULL, NULL },
+	[OPT_NUM_LOGIC] = { "numchannels", "Number of logic channels", "The number of (logic) channels (single-col. mode: number of bits beginning at 'first channel', LSB-first)", NULL, NULL },
+	[OPT_DELIM] = { "delimiter", "Column delimiter", "The column delimiter (>= 1 characters)", NULL, NULL },
+	[OPT_FORMAT] = { "format", "Data format (single-col. mode)", "The numeric format of the data (single-col. mode): bin, hex, oct", NULL, NULL },
+	[OPT_COMMENT] = { "comment", "Comment character(s)", "The comment prefix character(s)", NULL, NULL },
+	[OPT_RATE] = { "samplerate", "Samplerate (Hz)", "The sample rate (used during capture) in Hz", NULL, NULL },
+	[OPT_FIRST_LOGIC] = { "first-channel", "First channel", "The column number of the first channel (multi-col. mode); bit position for the first channel (single-col. mode)", NULL, NULL },
+	[OPT_HEADER] = { "header", "Interpret first line as header (multi-col. mode)", "Treat the first line as header with channel names (multi-col. mode)", NULL, NULL },
+	[OPT_START] = { "startline", "Start line", "The line number at which to start processing samples (>= 1)", NULL, NULL },
+	[OPT_MAX] = ALL_ZERO,
 };
 
 static const struct sr_option *get_options(void)
@@ -983,20 +995,20 @@ static const struct sr_option *get_options(void)
 	GSList *l;
 
 	if (!options[0].def) {
-		options[0].def = g_variant_ref_sink(g_variant_new_int32(0));
-		options[1].def = g_variant_ref_sink(g_variant_new_int32(0));
-		options[2].def = g_variant_ref_sink(g_variant_new_string(","));
-		options[3].def = g_variant_ref_sink(g_variant_new_string("bin"));
+		options[OPT_SINGLE_COL].def = g_variant_ref_sink(g_variant_new_int32(0));
+		options[OPT_NUM_LOGIC].def = g_variant_ref_sink(g_variant_new_int32(0));
+		options[OPT_DELIM].def = g_variant_ref_sink(g_variant_new_string(","));
+		options[OPT_FORMAT].def = g_variant_ref_sink(g_variant_new_string("bin"));
 		l = NULL;
 		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("bin")));
 		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("hex")));
 		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("oct")));
-		options[3].values = l;
-		options[4].def = g_variant_ref_sink(g_variant_new_string(";"));
-		options[5].def = g_variant_ref_sink(g_variant_new_uint64(0));
-		options[6].def = g_variant_ref_sink(g_variant_new_int32(0));
-		options[7].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
-		options[8].def = g_variant_ref_sink(g_variant_new_int32(1));
+		options[OPT_FORMAT].values = l;
+		options[OPT_COMMENT].def = g_variant_ref_sink(g_variant_new_string(";"));
+		options[OPT_RATE].def = g_variant_ref_sink(g_variant_new_uint64(0));
+		options[OPT_FIRST_LOGIC].def = g_variant_ref_sink(g_variant_new_int32(0));
+		options[OPT_HEADER].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
+		options[OPT_START].def = g_variant_ref_sink(g_variant_new_int32(1));
 	}
 
 	return options;