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

input: Actually return a NULL-terminated array.

This commit is contained in:
Bert Vermeulen 2014-08-15 23:31:20 +02:00
parent 20e8882106
commit bd0bfaafd8
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libsigrok/proto.h
View File

@ -129,8 +129,8 @@ 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_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_description_get(const struct sr_input_module *in);
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 *in);
SR_API void sr_input_options_free(const struct sr_input_module *in); 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);
SR_API const struct sr_input *sr_input_scan_buffer(GString *buf); SR_API const struct sr_input *sr_input_scan_buffer(GString *buf);

27
src/input/input.c
View File

@ -157,29 +157,41 @@ SR_API const struct sr_input_module *sr_input_find(char *id)
* *
* @since 0.4.0 * @since 0.4.0
*/ */
SR_API const struct sr_option *sr_input_options_get(const struct sr_input_module *o) SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *imod)
{ {
const struct sr_option *mod_opts, **opts;
int size, i;
if (!o || !o->options) if (!imod || !imod->options)
return NULL; return NULL;
return o->options(); mod_opts = imod->options();
for (size = 1; mod_opts[size].id; size++)
;
opts = g_malloc(size * sizeof(struct sr_option *));
for (i = 0; i < size; i++)
opts[i] = &mod_opts[i];
opts[i] = NULL;
return opts;
} }
/** /**
* After a call to sr_input_options_get(), this function cleans up all * After a call to sr_input_options_get(), this function cleans up all
* resources allocated by that call. * resources returned by that call.
* *
* @since 0.4.0 * @since 0.4.0
*/ */
SR_API void sr_input_options_free(const struct sr_input_module *o) SR_API void sr_input_options_free(const struct sr_option **options)
{ {
struct sr_option *opt; struct sr_option *opt;
if (!o || !o->options) if (!options)
return; return;
for (opt = o->options(); opt->id; opt++) { for (opt = (struct sr_option *)options[0]; opt; opt++) {
if (opt->def) { if (opt->def) {
g_variant_unref(opt->def); g_variant_unref(opt->def);
opt->def = NULL; opt->def = NULL;
@ -190,6 +202,7 @@ SR_API void sr_input_options_free(const struct sr_input_module *o)
opt->values = NULL; opt->values = NULL;
} }
} }
g_free(options);
} }
/** /**