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.

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index edcd4c978582146e6cd43cf936f604518f99142c..a159baed6c541d0626ac4231053145397ff35a90 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -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_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,

diff --git a/src/output/output.c b/src/output/output.c
index 3e432c9f0c7b82458621ef70ab0da8fa16b38364..0dd1fe27f7e1cf6bf19f5674cae2546526a82906 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -160,29 +160,41 @@ SR_API const struct sr_output_module *sr_output_find(char *id)
  *
  * @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)
                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
- * resources allocated by that call.
+ * resources returned by that call.
  *
  * @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;
 
-       if (!o || !o->options)
+       if (!opts)
                return;
 
-       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;
@@ -193,6 +205,7 @@ SR_API void sr_output_options_free(const struct sr_output_module *o)
                        opt->values = NULL;
                }
        }
+       g_free(opts);
 }
 
 /**