Add filename field to sr_output and make it accessible

[libsigrok.git] / src / output / output.c

diff --git a/src/output/output.c b/src/output/output.c
index 7eaa489ee8561142f97fabc3aa964526ab47cf8c..04f3054cf1deafeb7674e2fda07adc5c7a926fbb 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -21,7 +21,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "output"
+/** @endcond */
 
 /**
  * @file
@@ -95,14 +97,14 @@ SR_API const struct sr_output_module **sr_output_list(void)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_id_get(const struct sr_output_module *o)
+SR_API const char *sr_output_id_get(const struct sr_output_module *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->id;
+       return omod->id;
 }
 
 /**
@@ -110,14 +112,14 @@ SR_API const char *sr_output_id_get(const struct sr_output_module *o)
  *
  * @since 0.4.0
  */
-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 *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->name;
+       return omod->name;
 }
 
 /**
@@ -125,14 +127,14 @@ SR_API const char *sr_output_name_get(const struct sr_output_module *o)
  *
  * @since 0.4.0
  */
-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 *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->desc;
+       return omod->desc;
 }
 
 /**
@@ -144,14 +146,14 @@ SR_API const char *sr_output_description_get(const struct sr_output_module *o)
  * @since 0.4.0
  */
 SR_API const char *const *sr_output_extensions_get(
-               const struct sr_output_module *o)
+               const struct sr_output_module *omod)
 {
-       if (!o) {
+       if (!omod) {
                sr_err("Invalid output module NULL!");
                return NULL;
        }
 
-       return o->exts;
+       return omod->exts;
 }
 
 /**
@@ -181,15 +183,15 @@ 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 *omod)
 {
        const struct sr_option *mod_opts, **opts;
        int size, i;
 
-       if (!o || !o->options)
+       if (!omod || !omod->options)
                return NULL;
 
-       mod_opts = o->options();
+       mod_opts = omod->options();
 
        for (size = 0; mod_opts[size].id; size++)
                ;
@@ -242,8 +244,9 @@ SR_API void sr_output_options_free(const struct sr_option **options)
  *
  * @since 0.4.0
  */
-SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
-               GHashTable *options, const struct sr_dev_inst *sdi)
+SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
+               GHashTable *options, const struct sr_dev_inst *sdi,
+               const char *filename)
 {
        struct sr_output *op;
        const struct sr_option *mod_opts;
@@ -254,13 +257,14 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
        int i;
 
        op = g_malloc(sizeof(struct sr_output));
-       op->module = o;
+       op->module = omod;
        op->sdi = sdi;
+       op->filename = g_strdup(filename);
 
        new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
                        (GDestroyNotify)g_variant_unref);
-       if (o->options) {
-               mod_opts = o->options();
+       if (omod->options) {
+               mod_opts = omod->options();
                for (i = 0; mod_opts[i].id; i++) {
                        if (options && g_hash_table_lookup_extended(options,
                                        mod_opts[i].id, &key, &value)) {
@@ -285,7 +289,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
                        g_hash_table_iter_init(&iter, options);
                        while (g_hash_table_iter_next(&iter, &key, &value)) {
                                if (!g_hash_table_lookup(new_opts, key)) {
-                                       sr_err("Output module '%s' has no option '%s'", o->id, key);
+                                       sr_err("Output module '%s' has no option '%s'", omod->id, key);
                                        g_hash_table_destroy(new_opts);
                                        g_free(op);
                                        return NULL;
@@ -333,6 +337,7 @@ SR_API int sr_output_free(const struct sr_output *o)
        ret = SR_OK;
        if (o->module->cleanup)
                ret = o->module->cleanup((struct sr_output *)o);
+       g_free((char *)o->filename);
        g_free((gpointer)o);
 
        return ret;