Fix output module enumeration + code cleanup.

[sigrok-cli.git] / show.c

diff --git a/show.c b/show.c
index ba15120660123a3aa110515749305cc8fc36dbc5..79273a4d4f52174cbd2193e2e6aef80170b4923f 100644 (file)
--- a/show.c
+++ b/show.c
@@ -550,12 +550,13 @@ void show_dev_detail(void)
 #ifdef HAVE_SRD
 void show_pd_detail(void)
 {
-       GSList *l, *ll, *ol;
        struct srd_decoder *dec;
        struct srd_decoder_option *o;
-       char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
        struct srd_channel *pdch;
        struct srd_decoder_annotation_row *r;
+       GSList *l, *ll, *ol;
+       int idx;
+       char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
 
        pdtokens = g_strsplit(opt_pds, ",", -1);
        for (pdtok = pdtokens; *pdtok; pdtok++) {
@@ -583,8 +584,13 @@ void show_pd_detail(void)
                        for (l = dec->annotation_rows; l; l = l->next) {
                                r = l->data;
                                printf("- %s (%s): ", r->id, r->desc);
-                               for (ll = r->ann_classes; ll; ll = ll->next)
-                                       printf("%d ", GPOINTER_TO_INT(ll->data));
+                               for (ll = r->ann_classes; ll; ll = ll->next) {
+                                       idx = GPOINTER_TO_INT(ll->data);
+                                       ann = g_slist_nth_data(dec->annotations, idx);
+                                       printf("%s", ann[0]);
+                                       if (ll->next)
+                                               printf(", ");
+                               }
                                printf("\n");
                        }
                } else {
@@ -641,27 +647,29 @@ void show_pd_detail(void)
 void show_output(void)
 {
        const struct sr_output_module *omod;
-       const struct sr_option *opt;
+       const struct sr_option **opts;
        GSList *l;
-       char *s;
+       int i;
+       char *s, **tok;
 
-       if (!(omod = sr_output_find(opt_output_format)))
+       tok = g_strsplit(opt_output_format, ":", 0);
+       if (!tok[0] || !(omod = sr_output_find(tok[0])))
                g_critical("Output module '%s' not found.", opt_output_format);
 
        printf("ID: %s\nName: %s\n", sr_output_id_get(omod),
                        sr_output_name_get(omod));
        printf("Description: %s\n", sr_output_description_get(omod));
-       if ((opt = sr_output_options_get(omod))) {
+       if ((opts = sr_output_options_get(omod))) {
                printf("Options:\n");
-               while (opt->id) {
-                       printf("  %s: %s", opt->id, opt->desc);
-                       if (opt->def) {
-                               s = g_variant_print(opt->def, FALSE);
+               for (i = 0; opts[i]; i++) {
+                       printf("  %s: %s", opts[i]->id, opts[i]->desc);
+                       if (opts[i]->def) {
+                               s = g_variant_print(opts[i]->def, FALSE);
                                printf(" (default %s", s);
                                g_free(s);
-                               if (opt->values) {
+                               if (opts[i]->values) {
                                        printf(", possible values ");
-                                       for (l = opt->values; l; l = l->next) {
+                                       for (l = opts[i]->values; l; l = l->next) {
                                                s = g_variant_print((GVariant *)l->data, FALSE);
                                                printf("%s%s", s, l->next ? ", " : "");
                                                g_free(s);
@@ -670,9 +678,9 @@ void show_output(void)
                                printf(")");
                        }
                        printf("\n");
-                       opt++;
                }
-               sr_output_options_free(omod);
+               sr_output_options_free(opts);
        }
+       g_strfreev(tok);
 }