show: Only use decoder tags if they're available.

This allows us to reduce the libsigrokdecode requirement back to >= 0.5.0,
i.e. we don't strictly need libsigrokdecode >= 0.6.0.

diff --git a/README b/README
index d33597a511daa4ed6a1bea925591ac1b99a73505..2bbf6ec0c147b920c535b78b4fbfc6b5ad885bbd 100644 (file)
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Requirements
  - pkg-config >= 0.22
  - libglib >= 2.32.0
  - libsigrok >= 0.5.0
  - pkg-config >= 0.22
  - libglib >= 2.32.0
  - libsigrok >= 0.5.0

- - libsigrokdecode >= 0.6.0
+ - libsigrokdecode >= 0.5.0

 
 
 Building and installing
 
 
 Building and installing

diff --git a/show.c b/show.c
index 5c35bb317c972b0442622ef36245a68fd0ba7d63..9ce35b4a61b4360e39dcc03cbc6c985371a580bb 100644 (file)
--- a/show.c
+++ b/show.c
@@ -22,6 +22,10 @@
 #include <string.h>
 #include "sigrok-cli.h"
 
 #include <string.h>
 #include "sigrok-cli.h"
 

+#define DECODERS_HAVE_TAGS \
+       ((SRD_PACKAGE_VERSION_MAJOR > 0) || \
+        (SRD_PACKAGE_VERSION_MAJOR == 0) && (SRD_PACKAGE_VERSION_MINOR > 5))
+

 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
        return strcmp(sr_input_id_get((struct sr_input_module *)a),
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
        return strcmp(sr_input_id_get((struct sr_input_module *)a),


@@ -235,11 +239,13 @@ void show_supported_wiki(void)
        for (l = sl; l; l = l->next) {
                dec = l->data;
 
        for (l = sl; l; l = l->next) {
                dec = l->data;
 

+#if DECODERS_HAVE_TAGS

                GString *tags = g_string_new(NULL);
                for (GSList *t = dec->tags; t; t = t->next)
                        g_string_append_printf(tags, "%s, ", (char *)t->data);
                if (tags->len != 0)
                        g_string_truncate(tags, tags->len - 2);
                GString *tags = g_string_new(NULL);
                for (GSList *t = dec->tags; t; t = t->next)
                        g_string_append_printf(tags, "%s, ", (char *)t->data);
                if (tags->len != 0)
                        g_string_truncate(tags, tags->len - 2);

+#endif

 
                GString *in = g_string_new(NULL);
                for (GSList *t = dec->inputs; t; t = t->next)
 
                GString *in = g_string_new(NULL);
                for (GSList *t = dec->inputs; t; t = t->next)


@@ -257,11 +263,19 @@ void show_supported_wiki(void)
                else
                        g_string_truncate(out, out->len - 2);
 
                else
                        g_string_truncate(out, out->len - 2);
 

+#if DECODERS_HAVE_TAGS

                printf("{{pd|%s|%s|%s|%s|%s|%s|%s|supported}}\n",
                        dec->id, dec->name, dec->longname, dec->desc,
                        tags->str, in->str, out->str);
                printf("{{pd|%s|%s|%s|%s|%s|%s|%s|supported}}\n",
                        dec->id, dec->name, dec->longname, dec->desc,
                        tags->str, in->str, out->str);

+#else
+               printf("{{pd|%s|%s|%s|%s|%s|%s|supported}}\n",
+                       dec->id, dec->name, dec->longname, dec->desc,
+                       in->str, out->str);
+#endif

 
 

+#if DECODERS_HAVE_TAGS

                g_string_free(tags, TRUE);
                g_string_free(tags, TRUE);

+#endif

                g_string_free(in, TRUE);
                g_string_free(out, TRUE);
        }
                g_string_free(in, TRUE);
                g_string_free(out, TRUE);
        }


@@ -880,6 +894,7 @@ static void show_pd_detail_single(const char *pd)
                        printf("None.\n");
                }
                printf("Decoder tags:\n");
                        printf("None.\n");
                }
                printf("Decoder tags:\n");

+#if DECODERS_HAVE_TAGS

                if (dec->tags) {
                        for (l = dec->tags; l; l = l->next) {
                                str = l->data;
                if (dec->tags) {
                        for (l = dec->tags; l; l = l->next) {
                                str = l->data;


@@ -888,6 +903,7 @@ static void show_pd_detail_single(const char *pd)
                } else {
                        printf("None.\n");
                }
                } else {
                        printf("None.\n");
                }

+#endif

                printf("Annotation classes:\n");
                if (dec->annotations) {
                        for (l = dec->annotations; l; l = l->next) {
                printf("Annotation classes:\n");
                if (dec->annotations) {
                        for (l = dec->annotations; l; l = l->next) {