X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fcsv.c;h=f4f11f25d18bd21287745620c3c61b93fce1cb3b;hb=HEAD;hp=19bed0b8f1ce493294164e2dce1710bdfb27613f;hpb=51e60cde097d0c770824585cdfe47735c6b5c248;p=libsigrok.git

diff --git a/src/input/csv.c b/src/input/csv.c
index 19bed0b8..66ac41dc 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -136,9 +136,6 @@
 /*
  * TODO
  *
- * - Unbreak analog data when submitted in the 'double' data type. This
- *   was observed with sigrok-cli screen output. Is analog.encoding->unitsize
- *   not handled appropriately? Is it a sigrok-cli or libsigrok issue?
  * - Add a test suite for input modules in general, and CSV in specific?
  *   Becomes more important with the multitude of options and their
  *   interaction. Could cover edge cases (BOM presence, line termination
@@ -146,7 +143,7 @@
  *   samplerates, etc).
  */
 
-typedef float csv_analog_t;	/* 'double' currently is flawed. */
+typedef double csv_analog_t;
 
 /* Single column formats. */
 enum single_col_format {
@@ -277,21 +274,13 @@ struct context {
 static int flush_samplerate(const struct sr_input *in)
 {
 	struct context *inc;
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_meta meta;
-	struct sr_config *src;
 
 	inc = in->priv;
 	if (!inc->calc_samplerate && inc->samplerate)
 		inc->calc_samplerate = inc->samplerate;
 	if (inc->calc_samplerate && !inc->samplerate_sent) {
-		packet.type = SR_DF_META;
-		packet.payload = &meta;
-		src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->calc_samplerate));
-		meta.config = g_slist_append(NULL, src);
-		sr_session_send(in->sdi, &packet);
-		g_slist_free(meta.config);
-		sr_config_free(src);
+		(void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+			g_variant_new_uint64(inc->calc_samplerate));
 		inc->samplerate_sent = TRUE;
 	}
 
@@ -350,6 +339,7 @@ static int flush_logic_samples(const struct sr_input *in)
 		return rc;
 
 	inc->datafeed_buf_fill = 0;
+
 	return SR_OK;
 }
 
@@ -368,6 +358,7 @@ static int queue_logic_samples(const struct sr_input *in)
 		if (rc != SR_OK)
 			return rc;
 	}
+
 	return SR_OK;
 }
 
@@ -388,8 +379,6 @@ static void set_analog_value(struct context *inc, size_t ch_idx, csv_analog_t va
 {
 	if (ch_idx >= inc->analog_channels)
 		return;
-	if (!value)
-		return;
 	inc->analog_sample_buffer[ch_idx * inc->analog_datafeed_buf_size] = value;
 }
 
@@ -443,6 +432,7 @@ static int flush_analog_samples(const struct sr_input *in)
 	}
 
 	inc->analog_datafeed_buf_fill = 0;
+
 	return SR_OK;
 }
 
@@ -461,6 +451,7 @@ static int queue_analog_samples(const struct sr_input *in)
 		if (rc != SR_OK)
 			return rc;
 	}
+
 	return SR_OK;
 }
 
@@ -664,10 +655,12 @@ static int make_column_details_from_format(const struct sr_input *in,
 			 * line won't get processed another time.
 			 */
 			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);
-			else
+			} else {
 				caption = NULL;
+			}
 			if (!caption || !*caption)
 				caption = NULL;
 			/*
@@ -728,6 +721,7 @@ static const struct column_details *lookup_column_details(struct context *inc, s
 		return NULL;
 	if (!nr || nr > inc->column_want_count)
 		return NULL;
+
 	return &inc->column_details[nr - 1];
 }
 
@@ -762,7 +756,20 @@ static void strip_comment(char *buf, const GString *prefix)
  */
 static char **split_line(char *buf, struct context *inc)
 {
-	return g_strsplit(buf, inc->delimiter->str, 0);
+	char **fields, *f;
+	size_t l;
+
+	fields = g_strsplit(buf, inc->delimiter->str, 0);
+	if (!fields)
+		return NULL;
+
+	l = g_strv_length(fields);
+	while (l--) {
+		f = fields[l];
+		g_strchomp(f);
+	}
+
+	return fields;
 }
 
 /**
@@ -1025,6 +1032,7 @@ static int parse_ignore(const char *column, struct context *inc,
 	(void)column;
 	(void)inc;
 	(void)details;
+
 	return SR_OK;
 }
 
@@ -1156,6 +1164,7 @@ static int format_match(GHashTable *metadata, unsigned int *confidence)
 
 	if (!status)
 		return SR_ERR;
+
 	return SR_OK;
 }
 
@@ -1443,7 +1452,7 @@ static int initial_parse(const struct sr_input *in, GString *buf)
 		inc->analog_datafeed_buf_size /= sample_size;
 		inc->analog_datafeed_buf_size /= inc->analog_channels;
 		sample_count = inc->analog_channels * inc->analog_datafeed_buf_size;
-		inc->analog_datafeed_buffer = g_malloc0(sample_count * sample_size);
+		inc->analog_datafeed_buffer = g_malloc(sample_count * sample_size);
 		if (!inc->analog_datafeed_buffer) {
 			sr_err("Cannot allocate datafeed send buffer (analog).");
 			ret = SR_ERR_MALLOC;
@@ -1788,7 +1797,7 @@ static struct sr_option options[] = {
 	},
 	[OPT_HEADER] = {
 		"header", "Get channel names from first line.",
-		"Use the first processed line's column captions (when available) as channel names. Off by default",
+		"Use the first processed line's column captions (when available) as channel names. Enabled by default.",
 		NULL, NULL,
 	},
 	[OPT_SAMPLERATE] = {
@@ -1825,7 +1834,7 @@ static const struct sr_option *get_options(void)
 		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("oct")));
 		options[OPT_SINGLE_FMT].values = l;
 		options[OPT_START_LINE].def = g_variant_ref_sink(g_variant_new_uint32(1));
-		options[OPT_HEADER].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
+		options[OPT_HEADER].def = g_variant_ref_sink(g_variant_new_boolean(TRUE));
 		options[OPT_SAMPLERATE].def = g_variant_ref_sink(g_variant_new_uint64(0));
 		options[OPT_COL_SEP].def = g_variant_ref_sink(g_variant_new_string(","));
 		options[OPT_COMMENT].def = g_variant_ref_sink(g_variant_new_string(";"));