X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;fp=decode.c;h=c88582449a64b6caabfc4adb7f27caea5c30c815;hp=b3d9bb2bd4e8f3a8f5346a9728da65fed6e9b7b0;hb=4171a0a082c4c41263d9a08944e1c668bdd489e1;hpb=11e554c26dc1e8e43b6def4a85ffe22658e06bbf

diff --git a/decode.c b/decode.c
index b3d9bb2..c885824 100644
--- a/decode.c
+++ b/decode.c
@@ -336,6 +336,7 @@ int setup_pd_annotations(char *opt_pd_annotations)
 			annlist = g_strsplit(ann_txt, ":", 0);
 			for (ann = annlist; *ann && **ann; ann++) {
 				ann_id = *ann;
+				/* Lookup annotation class. */
 				ann_class = 0;
 				for (l = dec->annotations; l; l = l->next, ann_class++) {
 					ann_descr = l->data;
@@ -343,18 +344,20 @@ int setup_pd_annotations(char *opt_pd_annotations)
 						/* Found it. */
 						break;
 				}
-				if (!l) {
-					g_critical("Annotation '%s' not found "
-							"for protocol decoder '%s'.", ann_id, dec_id);
-					g_strfreev(keyval);
-					g_strfreev(pds);
-					return 1;
+				if (l) {
+					l_ann = g_hash_table_lookup(pd_ann_visible, dec_id);
+					l_ann = g_slist_append(l_ann, GINT_TO_POINTER(ann_class));
+					g_hash_table_replace(pd_ann_visible, g_strdup(dec_id), l_ann);
+					g_debug("cli: Showing protocol decoder %s annotation "
+							"class %d (%s).", dec_id, ann_class, ann_descr[0]);
+					continue;
 				}
-				l_ann = g_hash_table_lookup(pd_ann_visible, dec_id);
-				l_ann = g_slist_append(l_ann, GINT_TO_POINTER(ann_class));
-				g_hash_table_replace(pd_ann_visible, g_strdup(dec_id), l_ann);
-				g_debug("cli: Showing protocol decoder %s annotation "
-						"class %d (%s).", dec_id, ann_class, ann_descr[0]);
+				/* No match found. */
+				g_critical("Annotation '%s' not found "
+						"for protocol decoder '%s'.", ann_id, dec_id);
+				g_strfreev(keyval);
+				g_strfreev(pds);
+				return 1;
 			}
 		} else {
 			/* No class specified: show all of them. */