BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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'.
This commit is contained in:
Uwe Hermann 2015-01-27 08:33:51 +01:00
parent a82c83c6a5
commit 4fb0a5f8a0
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/libsigrok/proto.h
View File

@ -147,13 +147,13 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session,
/*--- input/input.c ---------------------------------------------------------*/ /*--- input/input.c ---------------------------------------------------------*/
SR_API const struct sr_input_module **sr_input_list(void); 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_id_get(const struct sr_input_module *imod);
SR_API const char *sr_input_name_get(const struct sr_input_module *in); 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 *in); 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 void sr_input_options_free(const struct sr_option **options);
SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod, SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
GHashTable *options); GHashTable *options);
@ -167,15 +167,15 @@ SR_API void sr_input_free(const struct sr_input *in);
/*--- output/output.c -------------------------------------------------------*/ /*--- output/output.c -------------------------------------------------------*/
SR_API const struct sr_output_module **sr_output_list(void); 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_id_get(const struct sr_output_module *omod);
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_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_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); GHashTable *params, const struct sr_dev_inst *sdi);
SR_API int sr_output_send(const struct sr_output *o, SR_API int sr_output_send(const struct sr_output *o,
const struct sr_datafeed_packet *packet, GString **out); const struct sr_datafeed_packet *packet, GString **out);

24
src/input/input.c
View File

@ -89,14 +89,14 @@ SR_API const struct sr_input_module **sr_input_list(void)
* *
* @since 0.4.0 * @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!"); sr_err("Invalid input module NULL!");
return 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 * @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!"); sr_err("Invalid input module NULL!");
return 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 * @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!"); sr_err("Invalid input module NULL!");
return 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 * @since 0.4.0
*/ */
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)
{ {
if (!o) { if (!imod) {
sr_err("Invalid input module NULL!"); sr_err("Invalid input module NULL!");
return NULL; return NULL;
} }
return o->exts; return imod->exts;
} }
/** /**

40
src/output/output.c
View File

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