srd/cli/qt:s/decoders/decoder/ for consistency.

diff --git a/controller.c b/controller.c
index 4db4ee8543c174b4e09a85e5d577978fed599906..5979c3483b10ab8aa8cec51e919926d95136ad1b 100644 (file)
--- a/controller.c
+++ b/controller.c
@@ -119,7 +119,7 @@ SRD_API int srd_exit(void)
 {
        srd_dbg("Exiting libsigrokdecode.");
 
 {
        srd_dbg("Exiting libsigrokdecode.");
 

-       srd_decoders_unload_all();
+       srd_decoder_unload_all();

        g_slist_free(pd_list);
 
        /* Py_Finalize() returns void, any finalization errors are ignored. */
        g_slist_free(pd_list);
 
        /* Py_Finalize() returns void, any finalization errors are ignored. */


@@ -151,7 +151,7 @@ SRD_PRIV int add_modulepath(const char *path)
        wchar_t *wc_new_path;
        char *item;
 
        wchar_t *wc_new_path;
        char *item;
 

-       srd_dbg("adding %s to module path", path);
+       srd_dbg("Adding '%s' to module path.", path);

 
        new_path = g_string_sized_new(256);
        g_string_assign(new_path, g_strdup(path));
 
        new_path = g_string_sized_new(256);
        g_string_assign(new_path, g_strdup(path));

diff --git a/decoder.c b/decoder.c
index f620c1efb03b114accc7893352c6e37604edd31a..d7780d5b8e5d0d6fe086a27ce363c7011e4d1a9e 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -36,7 +36,7 @@ extern SRD_PRIV PyObject *mod_sigrokdecode;
  *
  * @return List of decoders, NULL if none are supported or loaded.
  */
  *
  * @return List of decoders, NULL if none are supported or loaded.
  */

-SRD_API GSList *srd_decoders_list(void)
+SRD_API GSList *srd_decoder_list(void)

 {
        return pd_list;
 }
 {
        return pd_list;
 }


@@ -53,7 +53,7 @@ SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id)
        GSList *l;
        struct srd_decoder *dec;
 
        GSList *l;
        struct srd_decoder *dec;
 

-       for (l = srd_decoders_list(); l; l = l->next) {
+       for (l = srd_decoder_list(); l; l = l->next) {

                dec = l->data;
                if (!strcmp(dec->id, id))
                        return dec;
                dec = l->data;
                if (!strcmp(dec->id, id))
                        return dec;


@@ -134,7 +134,7 @@ SRD_API int srd_decoder_load(const char *module_name)
        int alen, ret, i;
        char **ann;
 
        int alen, ret, i;
        char **ann;
 

-       srd_dbg("Loading module '%s'.", module_name);
+       srd_dbg("Loading protocol decoder '%s'.", module_name);

 
        py_basedec = py_method = py_attr = NULL;
 
 
        py_basedec = py_method = py_attr = NULL;
 


@@ -340,7 +340,7 @@ static void free_probes(GSList *probelist)
  */
 SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 {
  */
 SRD_API int srd_decoder_unload(struct srd_decoder *dec)
 {

-       srd_dbg("Unloading decoder '%s'.", dec->name);
+       srd_dbg("Unloading protocol decoder '%s'.", dec->name);

 
        /*
         * Since any instances of this decoder need to be released as well,
 
        /*
         * Since any instances of this decoder need to be released as well,


@@ -379,7 +379,7 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */

-SRD_API int srd_decoders_load_all(void)
+SRD_API int srd_decoder_load_all(void)

 {
        GDir *dir;
        GError *error;
 {
        GDir *dir;
        GError *error;


@@ -404,12 +404,12 @@ SRD_API int srd_decoders_load_all(void)
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */

-SRD_API int srd_decoders_unload_all(void)
+SRD_API int srd_decoder_unload_all(void)

 {
        GSList *l;
        struct srd_decoder *dec;
 
 {
        GSList *l;
        struct srd_decoder *dec;
 

-       for (l = srd_decoders_list(); l; l = l->next) {
+       for (l = srd_decoder_list(); l; l = l->next) {

                dec = l->data;
                srd_decoder_unload(dec);
        }
                dec = l->data;
                srd_decoder_unload(dec);
        }

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 1cc678251c747554575608fa0598b7645ffefbe9..7e0b550f8d7794e893f5dc010453c65f2800e0ef 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -231,12 +231,12 @@ SRD_API int srd_register_callback(int output_type,
 
 /*--- decoder.c -------------------------------------------------------------*/
 
 
 /*--- decoder.c -------------------------------------------------------------*/
 

-SRD_API GSList *srd_decoders_list(void);
+SRD_API GSList *srd_decoder_list(void);

 SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id);
 SRD_API int srd_decoder_load(const char *name);
 SRD_API int srd_decoder_unload(struct srd_decoder *dec);
 SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id);
 SRD_API int srd_decoder_load(const char *name);
 SRD_API int srd_decoder_unload(struct srd_decoder *dec);

-SRD_API int srd_decoders_load_all(void);
-SRD_API int srd_decoders_unload_all(void);
+SRD_API int srd_decoder_load_all(void);
+SRD_API int srd_decoder_unload_all(void);

 SRD_API char *srd_decoder_doc(const struct srd_decoder *dec);
 
 /*--- log.c -----------------------------------------------------------------*/
 SRD_API char *srd_decoder_doc(const struct srd_decoder *dec);
 
 /*--- log.c -----------------------------------------------------------------*/