srd: rename extra_probes to optional_probes

diff --git a/controller.c b/controller.c
index 2355deea96a8ca651d9f55a34dfefae082a36aad..d7d3faf2999e074567e6ce9a60ab26d82fae7e70 100644 (file)
--- a/controller.c
+++ b/controller.c
@@ -339,7 +339,7 @@ int srd_instance_set_probes(struct srd_decoder_instance *di,
                if (!(sl = g_slist_find_custom(di->decoder->probes, probe_id,
                                (GCompareFunc)compare_probe_id))) {
                        /* Fall back on optional probes. */
-                       if (!(sl = g_slist_find_custom(di->decoder->extra_probes,
+                       if (!(sl = g_slist_find_custom(di->decoder->opt_probes,
                                        probe_id, (GCompareFunc)compare_probe_id))) {
                                srd_err("Protocol decoder %s has no probe '%s'.",
                                                di->decoder->name, probe_id);
@@ -395,7 +395,7 @@ struct srd_decoder_instance *srd_instance_new(const char *decoder_id,
         * order in which the decoder class defined them.
         */
        di->dec_num_probes = g_slist_length(di->decoder->probes) +
-                       g_slist_length(di->decoder->extra_probes);
+                       g_slist_length(di->decoder->opt_probes);
        if (di->dec_num_probes) {
                if (!(di->dec_probemap = g_try_malloc(sizeof(int) * di->dec_num_probes))) {
                        srd_err("Failed to malloc probe map.");

diff --git a/decoder.c b/decoder.c
index 83735a7ec3442ae30a199393b376db0b5a1d6836..6f4a88dbeb740e05d99d6677c15d3c970fd7385a 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -220,7 +220,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
                goto err_out;
 
        /* Check and import optional probes. */
-       if (get_probes(d, "extra_probes", &d->extra_probes) != SRD_OK)
+       if (get_probes(d, "optional_probes", &d->opt_probes) != SRD_OK)
                goto err_out;
 
        /* Store required fields in newly allocated strings. */
@@ -342,7 +342,7 @@ int srd_unload_decoder(struct srd_decoder *dec)
        srd_instance_free_all(NULL);
 
        free_probes(dec->probes);
-       free_probes(dec->extra_probes);
+       free_probes(dec->opt_probes);
        g_free(dec->id);
        g_free(dec->name);
        g_free(dec->longname);

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 201aea4c0d9a23f2950b40d91981b6060b76c08c..2a78a4dd39f3f573679aa7d0691ac4d67417c246 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -103,7 +103,7 @@ struct srd_decoder {
        GSList *probes;
 
        /** Optional probes */
-       GSList *extra_probes;
+       GSList *opt_probes;
 
        /* List of NULL-terminated char[], containing descriptions of the
         * supported annotation output.