summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
inline | side by side (from parent 1:
db81fbb)
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.
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 struct sr_output_module *sr_output_find(char *id);
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 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 void sr_output_options_free(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_option **opts);
SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
GHashTable *params, const struct sr_dev_inst *sdi);
SR_API int sr_output_send(const struct sr_output *o,
SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
GHashTable *params, const struct sr_dev_inst *sdi);
SR_API int sr_output_send(const struct sr_output *o,
-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)
return NULL;
if (!o || !o->options)
return NULL;
+ 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.
-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)
- for (opt = o->options(); opt->id; opt++) {
+ for (opt = (struct sr_option *)opts[0]; opt; opt++) {
if (opt->def) {
g_variant_unref(opt->def);
opt->def = NULL;
if (opt->def) {
g_variant_unref(opt->def);
opt->def = NULL;