X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=bf6fc2fc772985425d5779437bcfd1d941aa433b;hp=24c700183f02e7793f5dfc8cdfc839dac28c1ada;hb=8f72edc3522b73ce55677e3ac4d7701726e574fd;hpb=e1a352d10076fd2c598befd54a4d6a6b60001eb6

diff --git a/decode.c b/decode.c
index 24c7001..bf6fc2f 100644
--- a/decode.c
+++ b/decode.c
@@ -38,6 +38,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
 	GSList *optl;
 	GVariant *gvar;
 	gint64 val_int;
+	double val_dbl;
 	int ret;
 	char *val_str, *conv;
 
@@ -53,14 +54,25 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
 		if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) {
 			gvar = g_variant_new_string(val_str);
 		} else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) {
+			conv = NULL;
 			val_int = strtoll(val_str, &conv, 0);
-			if (!conv || conv == val_str) {
+			if (!conv || conv == val_str || *conv) {
 				g_critical("Protocol decoder '%s' option '%s' "
 						"requires a number.", dec->name, o->id);
 				ret = FALSE;
 				break;
 			}
 			gvar = g_variant_new_int64(val_int);
+		} else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_DOUBLE)) {
+			conv = NULL;
+			val_dbl = strtod(val_str, &conv);
+			if (!conv || conv == val_str || *conv) {
+				g_critical("Protocol decoder '%s' option '%s' requires a float number.",
+					dec->name, o->id);
+				ret = FALSE;
+				break;
+			}
+			gvar = g_variant_new_double(val_dbl);
 		} else {
 			g_critical("Unsupported type for option '%s' (%s)",
 					o->id, g_variant_get_type_string(o->def));
@@ -305,10 +317,14 @@ int setup_pd_annotations(char *opt_pd_annotations)
 		keyval = g_strsplit(*pdtok, "=", 0);
 		if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
 			g_critical("Protocol decoder '%s' not found.", keyval[0]);
+			g_strfreev(keyval);
+			g_strfreev(pds);
 			return 1;
 		}
 		if (!dec->annotations) {
 			g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
+			g_strfreev(keyval);
+			g_strfreev(pds);
 			return 1;
 		}
 		if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') {
@@ -324,6 +340,8 @@ int setup_pd_annotations(char *opt_pd_annotations)
 				if (!l) {
 					g_critical("Annotation '%s' not found "
 							"for protocol decoder '%s'.", *ann, keyval[0]);
+					g_strfreev(keyval);
+					g_strfreev(pds);
 					return 1;
 				}
 				l_ann = g_hash_table_lookup(pd_ann_visible, keyval[0]);
@@ -424,7 +442,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 	int i;
 	char **ann_descr;
 	gboolean show_ann, show_snum, show_class, show_quotes, show_abbrev;
-	gboolean show_id_colon;
 	const char *quote;
 
 	(void)cb_data;
@@ -452,8 +469,8 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 		return;
 
 	/*
-	 * Determine the annotation's layout from the verbosity of the
-	 * log level:
+	 * Determine which fields of the annotation to display. Inspect
+	 * user specified options as well as the verbosity of the log level:
 	 * - Optionally show the sample numbers for the annotation's span.
 	 * - Always show the protocol decoder ID.
 	 * - Optionally show the annotation's class description.
@@ -464,7 +481,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 	 *   recipients might have to deal with a set of text variants.
 	 */
 	show_snum = show_class = show_quotes = show_abbrev = FALSE;
-	if (opt_loglevel > SR_LOG_WARN) {
+	if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN) {
 		show_snum = TRUE;
 	}
 	if (opt_loglevel > SR_LOG_WARN) {
@@ -474,8 +491,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 		show_class = TRUE;
 		show_abbrev = TRUE;
 	}
-	/* Backwards (bug?) compatibility. */
-	show_id_colon = show_abbrev || !show_quotes;
 
 	/*
 	 * Display the annotation's fields after the layout was
@@ -485,7 +500,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 		printf("%" PRIu64 "-%" PRIu64 " ",
 			pdata->start_sample, pdata->end_sample);
 	}
-	printf("%s%s ", pdata->pdo->proto_id, show_id_colon ? ":" : "");
+	printf("%s: ", pdata->pdo->proto_id);
 	if (show_class) {
 		ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class);
 		printf("%s: ", ann_descr[0]);
@@ -509,7 +524,7 @@ void show_pd_meta(struct srd_proto_data *pdata, void *cb_data)
 		/* Not in the list of PDs whose meta output we're showing. */
 		return;
 
-	if (opt_loglevel > SR_LOG_WARN)
+	if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN)
 		printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
 	printf("%s: ", pdata->pdo->proto_id);
 	printf("%s: %s", pdata->pdo->meta_name, g_variant_print(pdata->data, FALSE));