sr: Made the dev_info_get return value const

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 119a46f2df41684b0e5c5ac4e16107e1df338d8d..7c77bfbcb9df57d5f0c254b2fb1f42f8a46f9424 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -168,7 +168,7 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index e5bd550520111fcf4147df7cbb27641051d87bbc..12d312442ec62dc2898e16f0ba055229002d2cce 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -753,11 +753,11 @@ static int hw_cleanup(void)
        return ret;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       void *info = NULL;
+       const void *info = NULL;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("sigma: %s: sdi was NULL", __func__);

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index a08b4b7f59864583272721ad0a19ba5f8c8008c5..38902908b7cdf06e3434653b47d930b24e567ea3 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -681,11 +681,11 @@ static int hw_cleanup(void)
        return ret;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       void *info;
+       const void *info;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("la8: %s: sdi was NULL", __func__);

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index ca572af8a009e6892e2a6b62446997722d86b02e..adf873043570617cd3eebe9b599db41a9893ca7a 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -184,10 +184,10 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
-       void *info = NULL;
+       const void *info = NULL;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("demo: %s: sdi was NULL", __func__);

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index ccaf7d0d97bf4157f5e6ca991b31bf64c63c498f..38f3d14d49656e9388cff9d28e668f1dda493277 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -546,7 +546,7 @@ static int hw_cleanup(void)
        return ret;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index cce8d87c01d9019b2d97077986720a6c185619ba..30449e08265ec8e722c004be6bec4c5d909b2dc3 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -607,11 +607,11 @@ static int hw_dev_close(int dev_index)
        return SR_OK;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       void *info = NULL;
+       const void *info = NULL;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return NULL;

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index ef7e3ebd737ba456edfd7403cf8774ab69afcf37..05e138e9e93a4a10e01300f3f38231cd42b5afdc 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -557,11 +557,11 @@ static int hw_cleanup(void)
        return ret;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       void *info;
+       const void *info;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return NULL;

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 1b779878b9be8205700ea050109a4781bcd49ccc..95033ccddb3ca9060b2d067cec69c75c960a89b3 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -499,11 +499,11 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       void *info;
+       const void *info;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);

diff --git a/sigrok.h.in b/sigrok.h.in
index 04d587207fb03c80c0d9b044ceb80eea0212fcb4..759565dfb4a9f14ef2515a2f265fea79fa3e2e73 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -463,7 +463,7 @@ struct sr_dev_driver {
        /* Device-specific */
        int (*dev_open) (int dev_index);
        int (*dev_close) (int dev_index);
-       void *(*dev_info_get) (int dev_index, int dev_info_id);
+       const void *(*dev_info_get) (int dev_index, int dev_info_id);
        int (*dev_status_get) (int dev_index);
        const int *(*hwcap_get_all) (void);
        int (*dev_config_set) (int dev_index, int hwcap, void *value);

diff --git a/strutil.c b/strutil.c
index 26296cea21419aee00f784e18fbefcf02b2a55be..f70a6f35343840ed654b5daf45bbbdc04c2ee706 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -176,7 +176,8 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
        GSList *l;
        struct sr_probe *probe;
        int max_probes, probenum, i;
-       char **tokens, **triggerlist, *trigger, *tc, *trigger_types;
+       char **tokens, **triggerlist, *trigger, *tc;
+       const char *trigger_types;
        gboolean error;
 
        max_probes = g_slist_length(dev->probes);