X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=8e51e3f96b7285d23611d77b8ac8d46083ce1593;hb=aff94d065e3ef50fa022b3e79b0dc435ae2c5b0a;hp=3c1d2beb7c6beb1903066ec2a9731c39b80d9ed6;hpb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;p=libsigrok.git diff --git a/src/input/input.c b/src/input/input.c index 3c1d2beb..8e51e3f9 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -23,10 +23,12 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" +/** @cond PRIVATE */ #define LOG_PREFIX "input" +/** @endcond */ /** * @file @@ -89,14 +91,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 +106,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 +121,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 +140,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; } /** @@ -231,7 +233,7 @@ SR_API void sr_input_options_free(const struct sr_option **options) * * @param imod The input module to use. Must not be NULL. * @param options GHashTable consisting of keys corresponding with - * the module options \c id field. The values should be GVariant + * the module options @c id field. The values should be GVariant * pointers with sunk references, of the same GVariantType as the option's * default value. * @@ -588,5 +590,4 @@ SR_API void sr_input_free(const struct sr_input *in) g_free((gpointer)in); } - /** @} */