X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fcsv.c;h=ca451bc4b33e540f29ebc88866dd0b4361271bbe;hb=33aa8117e3640ab5d7663d5e974ae2de2b3d0239;hp=d6501ed99fc06d0c6b5ce44c7b5f3b8d0c3cff4a;hpb=811dcf7ea95384b0450d475699d3c20203d02132;p=libsigrok.git

diff --git a/src/input/csv.c b/src/input/csv.c
index d6501ed9..ca451bc4 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -277,21 +277,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 +342,7 @@ static int flush_logic_samples(const struct sr_input *in)
 		return rc;
 
 	inc->datafeed_buf_fill = 0;
+
 	return SR_OK;
 }
 
@@ -368,6 +361,7 @@ static int queue_logic_samples(const struct sr_input *in)
 		if (rc != SR_OK)
 			return rc;
 	}
+
 	return SR_OK;
 }
 
@@ -443,6 +437,7 @@ static int flush_analog_samples(const struct sr_input *in)
 	}
 
 	inc->analog_datafeed_buf_fill = 0;
+
 	return SR_OK;
 }
 
@@ -461,6 +456,7 @@ static int queue_analog_samples(const struct sr_input *in)
 		if (rc != SR_OK)
 			return rc;
 	}
+
 	return SR_OK;
 }
 
@@ -728,6 +724,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];
 }
 
@@ -751,7 +748,7 @@ static void strip_comment(char *buf, const GString *prefix)
 }
 
 /**
- * @brief Splits a text line into a set of columns.
+ * Splits a text line into a set of columns.
  *
  * @param[in] buf	The input text line to split.
  * @param[in] inc	The input module's context.
@@ -766,7 +763,7 @@ static char **split_line(char *buf, struct context *inc)
 }
 
 /**
- * @brief Parse a multi-bit field into several logic channels.
+ * Parse a multi-bit field into several logic channels.
  *
  * @param[in] column	The input text, a run of bin/hex/oct digits.
  * @param[in] inc	The input module's context.
@@ -876,7 +873,7 @@ static int parse_logic(const char *column, struct context *inc,
 }
 
 /**
- * @brief Parse a floating point text into an analog value.
+ * Parse a floating point text into an analog value.
  *
  * @param[in] column	The input text, a floating point number.
  * @param[in] inc	The input module's context.
@@ -925,7 +922,7 @@ static int parse_analog(const char *column, struct context *inc,
 }
 
 /**
- * @brief Parse a timestamp text, auto-determine samplerate.
+ * Parse a timestamp text, auto-determine samplerate.
  *
  * @param[in] column	The input text, a floating point number.
  * @param[in] inc	The input module's context.
@@ -1014,7 +1011,7 @@ static int parse_timestamp(const char *column, struct context *inc,
 }
 
 /**
- * @brief Parse routine which ignores the input text.
+ * Parse routine which ignores the input text.
  *
  * This routine exists to unify dispatch code paths, mapping input file
  * columns' data types to their respective parse routines.
@@ -1025,6 +1022,7 @@ static int parse_ignore(const char *column, struct context *inc,
 	(void)column;
 	(void)inc;
 	(void)details;
+
 	return SR_OK;
 }
 
@@ -1156,6 +1154,7 @@ static int format_match(GHashTable *metadata, unsigned int *confidence)
 
 	if (!status)
 		return SR_ERR;
+
 	return SR_OK;
 }
 
@@ -1388,7 +1387,7 @@ static int initial_parse(const struct sr_input *in, GString *buf)
 		ret = SR_ERR;
 		goto out;
 	}
-	sr_dbg("DIAG Got %zu columns in text line: %s.", num_columns, line);
+	sr_dbg("Got %zu columns in text line: %s.", num_columns, line);
 
 	/*
 	 * Interpret the user provided column format specs. This might
@@ -1788,7 +1787,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 +1824,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(";"));