diff options
| author | Bert Vermeulen <bert@biot.com> | 2012-02-01 00:07:55 +0100 |
|---|---|---|
| committer | Bert Vermeulen <bert@biot.com> | 2012-02-01 00:07:55 +0100 |
| commit | dcdf48838748df02bc3028c4a26ea6d4506ee542 (patch) | |
| tree | 6de26fccf39ac3834b8d28516463f9020aa622f8 | |
| parent | fa12a21e3c779df4e33dcfe394e2ded3f96028ce (diff) | |
| download | libsigrokdecode-dcdf48838748df02bc3028c4a26ea6d4506ee542.tar.gz libsigrokdecode-dcdf48838748df02bc3028c4a26ea6d4506ee542.zip | |
srd: rename extra_probes to optional_probes
| -rw-r--r-- | controller.c | 4 | ||||
| -rw-r--r-- | decoder.c | 4 | ||||
| -rw-r--r-- | sigrokdecode.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/controller.c b/controller.c index 2355dee..d7d3faf 100644 --- 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."); @@ -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 201aea4..2a78a4d 100644 --- 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. |