X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=2b95f2346fb2d22d3fd8b5bf4199aa980ba0bd88;hp=4888a7c506f00b85406a7e92ecf08e11f864afe8;hb=9054d075f459c094eef7e5b5629870610df06cd9;hpb=241f9b13e8d5f7de38f1e4762661dc6fc76ead24

diff --git a/decode.c b/decode.c
index 4888a7c..2b95f23 100644
--- a/decode.c
+++ b/decode.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <assert.h>
 #include "sigrok-cli.h"
 
 #ifdef HAVE_SRD
@@ -417,12 +416,6 @@ int setup_pd_binary(char *opt_pd_binary)
 	return 0;
 }
 
-static inline void pd_ann_check(gboolean chk)
-{
-
-	assert(chk);
-}
-
 void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 {
 	struct srd_decoder *dec;
@@ -431,7 +424,7 @@ 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;
 
@@ -458,8 +451,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.
@@ -470,7 +463,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) {
@@ -480,44 +473,25 @@ 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
 	 * determined above.
 	 */
-	pd_ann_check(show_ann);
-	if (opt_loglevel <= SR_LOG_WARN) {
-		pd_ann_check(!show_snum);
-		pd_ann_check(show_id_colon);
-		pd_ann_check(!show_class);
-		pd_ann_check(!show_quotes);
-		pd_ann_check(!show_abbrev);
-		/* Show only the longest annotation. */
-		printf("%s: %s", pdata->pdo->proto_id, pda->ann_text[0]);
-	} else if (opt_loglevel >= SR_LOG_INFO) {
-		/* Sample numbers and quotes around the longest annotation. */
-		pd_ann_check(show_snum);
-		printf("%"PRIu64"-%"PRIu64"", pdata->start_sample, pdata->end_sample);
-		if (opt_loglevel == SR_LOG_INFO) {
-			pd_ann_check(!show_id_colon);
-			pd_ann_check(!show_class);
-			pd_ann_check(show_quotes);
-			pd_ann_check(!show_abbrev);
-			printf(" %s \"%s\"", pdata->pdo->proto_id, pda->ann_text[0]);
-		} else {
-			pd_ann_check(show_id_colon);
-			pd_ann_check(show_class);
-			pd_ann_check(show_quotes);
-			pd_ann_check(show_abbrev);
-			/* Protocol decoder id, annotation class,
-			 * all annotation strings. */
-			ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class);
-			printf(" %s: %s:", pdata->pdo->proto_id, ann_descr[0]);
-			for (i = 0; pda->ann_text[i]; i++)
-				printf(" \"%s\"", pda->ann_text[i]);
-		}
+	if (show_snum) {
+		printf("%" PRIu64 "-%" PRIu64 " ",
+			pdata->start_sample, pdata->end_sample);
+	}
+	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]);
+	}
+	quote = show_quotes ? "\"" : "";
+	printf("%s%s%s", quote, pda->ann_text[0], quote);
+	if (show_abbrev) {
+		for (i = 1; pda->ann_text[i]; i++)
+			printf(" %s%s%s", quote, pda->ann_text[i], quote);
 	}
 	printf("\n");
 	fflush(stdout);
@@ -532,7 +506,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));