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

input: Fix option enumeration.

This commit is contained in:
Bert Vermeulen 2014-08-19 00:07:36 +02:00
parent d65fcbcd41
commit fe4fe25bf5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/input/input.c
View File

@ -167,9 +167,9 @@ SR_API const struct sr_option **sr_input_options_get(const struct sr_input_modul
mod_opts = imod->options(); mod_opts = imod->options();
for (size = 1; mod_opts[size].id; size++) for (size = 0; mod_opts[size].id; size++)
; ;
opts = g_malloc(size * sizeof(struct sr_option *)); opts = g_malloc((size + 1) * sizeof(struct sr_option *));
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
opts[i] = &mod_opts[i]; opts[i] = &mod_opts[i];
@ -186,20 +186,20 @@ SR_API const struct sr_option **sr_input_options_get(const struct sr_input_modul
*/ */
SR_API void sr_input_options_free(const struct sr_option **options) SR_API void sr_input_options_free(const struct sr_option **options)
{ {
struct sr_option *opt; int i;
if (!options) if (!options)
return; return;
for (opt = (struct sr_option *)options[0]; opt; opt++) { for (i = 0; options[i]; i++) {
if (opt->def) { if (options[i]->def) {
g_variant_unref(opt->def); g_variant_unref(options[i]->def);
opt->def = NULL; ((struct sr_option *)options[i])->def = NULL;
} }
if (opt->values) { if (options[i]->values) {
g_slist_free_full(opt->values, (GDestroyNotify)g_variant_unref); g_slist_free_full(options[i]->values, (GDestroyNotify)g_variant_unref);
opt->values = NULL; ((struct sr_option *)options[i])->values = NULL;
} }
} }
g_free(options); g_free(options);