output: Constify module options.

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 63fcff919c93f8c2c8455f44d084533aae1a9bba..fea409f06cadd7f57e32971469513291358ca317 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -205,11 +205,8 @@ struct sr_output_module {
        /**
         * Returns a NULL-terminated list of options this module can take.
         * Can be NULL, if the module has no options.
-        *
-        * If cached is TRUE, no new GVariants are created for the def and
-        * values fields; instead, the current values are returned.
         */
-       struct sr_option *(*options) (void);
+       const struct sr_option *(*options) (void);
 
        /**
         * This function is called once, at the beginning of an output stream.

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 562d02551b4aff4a7ea5ac965fb380e243c77cd9..9f69d0076040ba7269745984c1bf5e6caed6322e 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -238,7 +238,7 @@ static struct sr_option options[] = {
        { 0 }
 };
 
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
 {
        if (!options[0].def) {
                options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);

diff --git a/src/output/bits.c b/src/output/bits.c
index 728ff2ffb3140c608f85e11492ed28a5f736eb6d..6b33f8d6534ec7dc23d6185c4d179b3d6e6c8a07 100644 (file)
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -224,7 +224,7 @@ static struct sr_option options[] = {
        { 0 }
 };
 
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
 {
        if (!options[0].def) {
                options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);

diff --git a/src/output/hex.c b/src/output/hex.c
index 1d4196381d3a706440eb1b52c468c6c20d6e4703..6c0e15d5c51fb6ec5f29daaff2a8dc04ae9021df 100644 (file)
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -238,7 +238,7 @@ static struct sr_option options[] = {
        { 0 }
 };
 
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
 {
        if (!options[0].def) {
                options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);

diff --git a/src/output/output.c b/src/output/output.c
index 0dd1fe27f7e1cf6bf19f5674cae2546526a82906..a96fab2b52c6fb03d13f2761c0962dcc8c352e82 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -225,7 +225,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
                GHashTable *options, const struct sr_dev_inst *sdi)
 {
        struct sr_output *op;
-       struct sr_option *mod_opts;
+       const struct sr_option *mod_opts;
        const GVariantType *gvt;
        GHashTable *new_opts;
        GHashTableIter iter;

diff --git a/src/output/wav.c b/src/output/wav.c
index 679bee68b661923a44dc586a71e2abca442a2030..9dc5a1103e05386f27cc1468ca69b81b503b6092 100644 (file)
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -339,7 +339,7 @@ static struct sr_option options[] = {
        { 0 }
 };
 
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
 {
        if (!options[0].def)
                options[0].def = g_variant_ref_sink(g_variant_new_double(0.0));