decode: rephrase logic which looks up -A specs

[sigrok-cli.git] / decode.c

diff --git a/decode.c b/decode.c
index 1ba5ef20ec80781de8ba3f3c0fa46a730ea6a7e3..c88582449a64b6caabfc4adb7f27caea5c30c815 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -310,46 +310,62 @@ int setup_pd_annotations(char *opt_pd_annotations)
        struct srd_decoder *dec;
        int ann_class;
        char **pds, **pdtok, **keyval, **annlist, **ann, **ann_descr;
+       const char *dec_id;
+       const char *ann_txt;
+       const char *ann_id;
 
        /* Set up custom list of PDs and annotations to show. */
        pds = g_strsplit(opt_pd_annotations, ",", 0);
        for (pdtok = pds; *pdtok && **pdtok; pdtok++) {
                keyval = g_strsplit(*pdtok, "=", 0);
-               if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
-                       g_critical("Protocol decoder '%s' not found.", keyval[0]);
+               dec_id = keyval[0];
+               if (!(dec = srd_decoder_get_by_id(dec_id))) {
+                       g_critical("Protocol decoder '%s' not found.", dec_id);
+                       g_strfreev(keyval);
+                       g_strfreev(pds);
                        return 1;
                }
                if (!dec->annotations) {
-                       g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
+                       g_critical("Protocol decoder '%s' has no annotations.", dec_id);
+                       g_strfreev(keyval);
+                       g_strfreev(pds);
                        return 1;
                }
-               if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') {
-                       annlist = g_strsplit(keyval[1], ":", 0);
+               ann_txt = (g_strv_length(keyval) == 2) ? keyval[1] : NULL;
+               if (ann_txt && *ann_txt) {
+                       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;
-                                       if (!canon_cmp(ann_descr[0], *ann))
+                                       if (!canon_cmp(ann_descr[0], ann_id))
                                                /* Found it. */
                                                break;
                                }
-                               if (!l) {
-                                       g_critical("Annotation '%s' not found "
-                                                       "for protocol decoder '%s'.", *ann, keyval[0]);
-                                       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, keyval[0]);
-                               l_ann = g_slist_append(l_ann, GINT_TO_POINTER(ann_class));
-                               g_hash_table_replace(pd_ann_visible, g_strdup(keyval[0]), l_ann);
-                               g_debug("cli: Showing protocol decoder %s annotation "
-                                               "class %d (%s).", keyval[0], 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. */
-                               g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]),
-                                               g_slist_append(NULL, GINT_TO_POINTER(-1)));
+                       ann_class = -1;
+                       l_ann = g_slist_append(NULL, GINT_TO_POINTER(ann_class));
+                       g_hash_table_insert(pd_ann_visible, g_strdup(dec_id), l_ann);
                        g_debug("cli: Showing all annotation classes for protocol "
-                                       "decoder %s.", keyval[0]);
+                                       "decoder %s.", dec_id);
                }
                g_strfreev(keyval);
        }