in/out: Minor consistency renames.

 - 'struct sr_input *' variables are consistently named 'in'.
 - 'struct sr_input_module *' variables are consistently named 'imod'.

 - 'struct sr_output *' variables are consistently named 'o'.
 - 'struct sr_output_module *' variables are consistently named 'omod'.

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 70bb5978d7237f4a6b62103fdbe871c4d70b403c..e74f39923e32e404e442ac6a3d39a89e8f6e20a3 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -147,13 +147,13 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session,
 /*--- input/input.c ---------------------------------------------------------*/
 
 SR_API const struct sr_input_module **sr_input_list(void);
-SR_API const char *sr_input_id_get(const struct sr_input_module *in);
-SR_API const char *sr_input_name_get(const struct sr_input_module *in);
-SR_API const char *sr_input_description_get(const struct sr_input_module *in);
+SR_API const char *sr_input_id_get(const struct sr_input_module *imod);
+SR_API const char *sr_input_name_get(const struct sr_input_module *imod);
+SR_API const char *sr_input_description_get(const struct sr_input_module *imod);
 SR_API const char *const *sr_input_extensions_get(
-               const struct sr_input_module *o);
+               const struct sr_input_module *imod);
 SR_API const struct sr_input_module *sr_input_find(char *id);
-SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *in);
+SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *imod);
 SR_API void sr_input_options_free(const struct sr_option **options);
 SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
                GHashTable *options);
@@ -167,15 +167,15 @@ SR_API void sr_input_free(const struct sr_input *in);
 /*--- output/output.c -------------------------------------------------------*/
 
 SR_API const struct sr_output_module **sr_output_list(void);
-SR_API const char *sr_output_id_get(const struct sr_output_module *o);
-SR_API const char *sr_output_name_get(const struct sr_output_module *o);
-SR_API const char *sr_output_description_get(const struct sr_output_module *o);
+SR_API const char *sr_output_id_get(const struct sr_output_module *omod);
+SR_API const char *sr_output_name_get(const struct sr_output_module *omod);
+SR_API const char *sr_output_description_get(const struct sr_output_module *omod);
 SR_API const char *const *sr_output_extensions_get(
-               const struct sr_output_module *o);
+               const struct sr_output_module *omod);
 SR_API const struct sr_output_module *sr_output_find(char *id);
-SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *o);
+SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *omod);
 SR_API void sr_output_options_free(const struct sr_option **opts);
-SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
+SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
                GHashTable *params, const struct sr_dev_inst *sdi);
 SR_API int sr_output_send(const struct sr_output *o,
                const struct sr_datafeed_packet *packet, GString **out);

diff --git a/src/input/input.c b/src/input/input.c
index 3c1d2beb7c6beb1903066ec2a9731c39b80d9ed6..2b5e3afbd8bae0f26018cd0a42cadc857fad0287 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -89,14 +89,14 @@ SR_API const struct sr_input_module **sr_input_list(void)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_id_get(const struct sr_input_module *o)
+SR_API const char *sr_input_id_get(const struct sr_input_module *imod)
 {
-       if (!o) {
+       if (!imod) {
                sr_err("Invalid input module NULL!");
                return NULL;
        }
 
-       return o->id;
+       return imod->id;
 }
 
 /**
@@ -104,14 +104,14 @@ SR_API const char *sr_input_id_get(const struct sr_input_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_name_get(const struct sr_input_module *o)
+SR_API const char *sr_input_name_get(const struct sr_input_module *imod)
 {
-       if (!o) {
+       if (!imod) {
                sr_err("Invalid input module NULL!");
                return NULL;
        }
 
-       return o->name;
+       return imod->name;
 }
 
 /**
@@ -119,14 +119,14 @@ SR_API const char *sr_input_name_get(const struct sr_input_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_description_get(const struct sr_input_module *o)
+SR_API const char *sr_input_description_get(const struct sr_input_module *imod)
 {
-       if (!o) {
+       if (!imod) {
                sr_err("Invalid input module NULL!");
                return NULL;
        }
 
-       return o->desc;
+       return imod->desc;
 }
 
 /**
@@ -138,14 +138,14 @@ SR_API const char *sr_input_description_get(const struct sr_input_module *o)
  * @since 0.4.0
  */
 SR_API const char *const *sr_input_extensions_get(
-               const struct sr_input_module *o)
+               const struct sr_input_module *imod)
 {
-       if (!o) {
+       if (!imod) {
                sr_err("Invalid input module NULL!");
                return NULL;
        }
 
-       return o->exts;
+       return imod->exts;
 }
 
 /**

diff --git a/src/output/output.c b/src/output/output.c
index 7eaa489ee8561142f97fabc3aa964526ab47cf8c..c9e49990fab91c5707e9a15ca9e0032122f93664 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -95,14 +95,14 @@ SR_API const struct sr_output_module **sr_output_list(void)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_id_get(const struct sr_output_module *o)
+SR_API const char *sr_output_id_get(const struct sr_output_module *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->id;
+       return omod->id;
 }
 
 /**
@@ -110,14 +110,14 @@ SR_API const char *sr_output_id_get(const struct sr_output_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_name_get(const struct sr_output_module *o)
+SR_API const char *sr_output_name_get(const struct sr_output_module *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->name;
+       return omod->name;
 }
 
 /**
@@ -125,14 +125,14 @@ SR_API const char *sr_output_name_get(const struct sr_output_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_description_get(const struct sr_output_module *o)
+SR_API const char *sr_output_description_get(const struct sr_output_module *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->desc;
+       return omod->desc;
 }
 
 /**
@@ -144,14 +144,14 @@ SR_API const char *sr_output_description_get(const struct sr_output_module *o)
  * @since 0.4.0
  */
 SR_API const char *const *sr_output_extensions_get(
-               const struct sr_output_module *o)
+               const struct sr_output_module *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->exts;
+       return omod->exts;
 }
 
 /**
@@ -181,15 +181,15 @@ SR_API const struct sr_output_module *sr_output_find(char *id)
  *
  * @since 0.4.0
  */
-SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *o)
+SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *omod)
 {
        const struct sr_option *mod_opts, **opts;
        int size, i;
 
-       if (!o || !o->options)
+       if (!omod || !omod->options)
                return NULL;
 
-       mod_opts = o->options();
+       mod_opts = omod->options();
 
        for (size = 0; mod_opts[size].id; size++)
                ;
@@ -242,7 +242,7 @@ SR_API void sr_output_options_free(const struct sr_option **options)
  *
  * @since 0.4.0
  */
-SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
+SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
                GHashTable *options, const struct sr_dev_inst *sdi)
 {
        struct sr_output *op;
@@ -254,13 +254,13 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
        int i;
 
        op = g_malloc(sizeof(struct sr_output));
-       op->module = o;
+       op->module = omod;
        op->sdi = sdi;
 
        new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
                        (GDestroyNotify)g_variant_unref);
-       if (o->options) {
-               mod_opts = o->options();
+       if (omod->options) {
+               mod_opts = omod->options();
                for (i = 0; mod_opts[i].id; i++) {
                        if (options && g_hash_table_lookup_extended(options,
                                        mod_opts[i].id, &key, &value)) {
@@ -285,7 +285,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
                        g_hash_table_iter_init(&iter, options);
                        while (g_hash_table_iter_next(&iter, &key, &value)) {
                                if (!g_hash_table_lookup(new_opts, key)) {
-                                       sr_err("Output module '%s' has no option '%s'", o->id, key);
+                                       sr_err("Output module '%s' has no option '%s'", omod->id, key);
                                        g_hash_table_destroy(new_opts);
                                        g_free(op);
                                        return NULL;