- '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'.
/*--- input/input.c ---------------------------------------------------------*/
SR_API const struct sr_input_module **sr_input_list(void);
/*--- 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(
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_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);
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);
/*--- output/output.c -------------------------------------------------------*/
SR_API const struct sr_output_module **sr_output_list(void);
/*--- 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(
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_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 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);
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);
-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)
sr_err("Invalid input module NULL!");
return NULL;
}
sr_err("Invalid input module NULL!");
return NULL;
}
-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)
sr_err("Invalid input module NULL!");
return NULL;
}
sr_err("Invalid input module NULL!");
return NULL;
}
-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)
sr_err("Invalid input module NULL!");
return NULL;
}
sr_err("Invalid input module NULL!");
return NULL;
}
* @since 0.4.0
*/
SR_API const char *const *sr_input_extensions_get(
* @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)
sr_err("Invalid input module NULL!");
return NULL;
}
sr_err("Invalid input module NULL!");
return NULL;
}
-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)
sr_err("Invalid output module NULL!");
return NULL;
}
sr_err("Invalid output module NULL!");
return NULL;
}
-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)
sr_err("Invalid output module NULL!");
return NULL;
}
sr_err("Invalid output module NULL!");
return NULL;
}
-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)
sr_err("Invalid output module NULL!");
return NULL;
}
sr_err("Invalid output module NULL!");
return NULL;
}
* @since 0.4.0
*/
SR_API const char *const *sr_output_extensions_get(
* @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)
sr_err("Invalid output module NULL!");
return NULL;
}
sr_err("Invalid output module NULL!");
return NULL;
}
-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;
{
const struct sr_option *mod_opts, **opts;
int size, i;
+ if (!omod || !omod->options)
- mod_opts = o->options();
+ mod_opts = omod->options();
for (size = 0; mod_opts[size].id; size++)
;
for (size = 0; mod_opts[size].id; size++)
;
-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;
GHashTable *options, const struct sr_dev_inst *sdi)
{
struct sr_output *op;
int i;
op = g_malloc(sizeof(struct sr_output));
int i;
op = g_malloc(sizeof(struct sr_output));
op->sdi = sdi;
new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)g_variant_unref);
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)) {
for (i = 0; mod_opts[i].id; i++) {
if (options && g_hash_table_lookup_extended(options,
mod_opts[i].id, &key, &value)) {
g_hash_table_iter_init(&iter, options);
while (g_hash_table_iter_next(&iter, &key, &value)) {
if (!g_hash_table_lookup(new_opts, key)) {
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;
g_hash_table_destroy(new_opts);
g_free(op);
return NULL;