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

output: Actually return a NULL-terminated array. 

This returned an array of structs with an NULL-ed element at the end.
The drivers still do this, but the wrappers now make and free a NULL-
terminated array around it.

sr_output_options_free() now takes the pointer returned by
sr_output_options_get(), instead of the module owning it.
This commit is contained in:
Bert Vermeulen 2014-08-15 20:16:31 +02:00
parent db81fbb582
commit fc74643098
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libsigrok/proto.h
View File

@ -133,8 +133,8 @@ 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_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_description_get(const struct sr_output_module *o);
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 *o);
SR_API void sr_output_options_free(const struct sr_output_module *o); 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 *o,
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,

25
src/output/output.c
View File

@ -160,29 +160,41 @@ 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 *o)
{ {
const struct sr_option *mod_opts, **opts;
int size, i;
if (!o || !o->options) if (!o || !o->options)
return NULL; return NULL;
return o->options(); mod_opts = o->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_output_options_get(), this function cleans up all * After a call to sr_output_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_output_options_free(const struct sr_output_module *o) SR_API void sr_output_options_free(const struct sr_option **opts)
{ {
struct sr_option *opt; struct sr_option *opt;
if (!o || !o->options) if (!opts)
return; return;
for (opt = o->options(); opt->id; opt++) { for (opt = (struct sr_option *)opts[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;
@ -193,6 +205,7 @@ SR_API void sr_output_options_free(const struct sr_output_module *o)
opt->values = NULL; opt->values = NULL;
} }
} }
g_free(opts);
} }
/** /**