Constify some more 'char *' parameters.

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index c985e6be90630a3ba1718462697ae99a6237afe7..4ec98a9e5a384b8f630b40f7699a4d151e8fe510 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -45,7 +45,7 @@ struct alsa {
        gpointer session_id;
 };
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        struct alsa *alsa;

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index ce67cc00fe36ad8ea784f908b7c723ad869e52fc..bc36764edfcd9df5d753157df03a28fc3bbe1a24 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -387,7 +387,7 @@ static int bin2bitbang(const char *filename,
        return 0;
 }
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        struct sigma *sigma = g_malloc(sizeof(struct sigma));

diff --git a/hardware/common/skeleton.c b/hardware/common/skeleton.c
index cc673291f11551c29c641f4a601712271bd6862c..352c4eabbe915a5d2b96124d9dba5ff5f1e7a0c1 100644 (file)
--- a/hardware/common/skeleton.c
+++ b/hardware/common/skeleton.c
@@ -19,7 +19,7 @@
 
 #include <sigrok.h>
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
 }
 

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 6bacaf03b85e0c530e300082171b692c8cd53e74..c318cb39acc7264e9cb7c36fdd50807307525740 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -98,7 +98,7 @@ static int thread_running;
 
 static void hw_stop_acquisition(int device_index, gpointer session_device_id);
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
 

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index bb72fd3ffefaac1dfbfa2b15ed6f320cd7abaa12..648fe5bb20e5b2a380397d9cc2420239ee3d9f82 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -347,7 +347,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
        return SR_OK;
 }
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        int devcnt = 0;

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 3c17e7e1201c112c80405ee3dbce29bd54b0de3d..d94f77106d310fe4403a1f6f20160fbbdd6db561 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -219,7 +219,7 @@ static uint32_t reverse32(uint32_t in)
        return out;
 }
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        GSList *ports, *l;

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 81ef3e8c7a96188d3457e308e7afa60e22dcd2df..eff4cf9e994edc4712694beaae7738b9a1a77479 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -291,7 +291,7 @@ static int configure_probes(GSList *probes)
  * API callbacks
  */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        struct libusb_device_descriptor des;

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index d55122a26e5e0ad504876d64683008bcc504c316..5574281134c2ba06f3f6130ff2fc39aa8a414961 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -273,7 +273,7 @@ static int configure_probes(GSList *probes)
  * API callbacks
  */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        struct libusb_device_descriptor des;

diff --git a/output/output_analog.c b/output/output_analog.c
index 94bd8d8d23f034dc236d0274f8f381c8c904a285..0eb897f7607f547b175911865e650ef8373353c1 100644 (file)
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -202,8 +202,8 @@ static int init_bits(struct sr_output *o)
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-static int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+static int data_bits(struct sr_output *o, const char *data_in,
+                    uint64_t length_in, char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
@@ -288,8 +288,8 @@ static int init_hex(struct sr_output *o)
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-static int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
-                   char **data_out, uint64_t *length_out)
+static int data_hex(struct sr_output *o, const char *data_in,
+                   uint64_t length_in, char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
@@ -353,8 +353,8 @@ static int init_ascii(struct sr_output *o)
        return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+static int data_ascii(struct sr_output *o, const char *data_in,
+                     uint64_t length_in, char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;

diff --git a/output/output_binary.c b/output/output_binary.c
index 2fee7fff41e34ecc120fa0d767378bcd88b5540e..e3edf62ef3e46fbf28bdad120f94d5eeac9771d0 100644 (file)
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -25,7 +25,7 @@
 #include "config.h"
 
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        char *outbuf;

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 10b9c2647eea6bab64595cd6c2a77f0c5d298a29..09a42ad65568977c1a6e481705c26f2feda4eb72 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -141,7 +141,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        return SR_OK;
 }
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        struct context *ctx;

diff --git a/output/output_ols.c b/output/output_ols.c
index bc006dc2ae6133c0d6728723f4541224bbb96b22..966eb0b75e0dffe42849db14f5d2dd8850c2dd9c 100644 (file)
--- a/output/output_ols.c
+++ b/output/output_ols.c
@@ -97,7 +97,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        return SR_OK;
 }
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        GString *out;

diff --git a/output/output_skeleton.c b/output/output_skeleton.c
index a58b87aa919b80cb3ba1b6b457ffb12979b58464..e4b3baf61c46532bfdbf4887b50fb81951ccd3b1 100644 (file)
--- a/output/output_skeleton.c
+++ b/output/output_skeleton.c
@@ -25,7 +25,7 @@ static int init(struct sr_output *o)
        return 0;
 }
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        return SR_OK;

diff --git a/output/output_vcd.c b/output/output_vcd.c
index 61d27a10ec157a538d338b6bca834536355d6aa7..17505e6a2a1af10f2df1309db12430a38d255912 100644 (file)
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -165,7 +165,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        return SR_OK;
 }
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        struct context *ctx;

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 3e7f2e3551215a5981ee72aa75b7d39c4a56ccf1..e4eacaf3d3d90c71a38efa66e65ada95c660e09b 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -30,8 +30,8 @@ int init_ascii(struct sr_output *o)
        return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
+              char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;

diff --git a/output/text/bits.c b/output/text/bits.c
index 755a463add7674fac33293857ebe13179c60c652..ccf550701e1c816affb0a94aa99220b5fca3fdfd 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -30,8 +30,8 @@ int init_bits(struct sr_output *o)
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
+             char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;

diff --git a/output/text/hex.c b/output/text/hex.c
index e63feb143e4f999467d8f6d85b69a87e86f86a94..37785af360a19e4f5abac3d64a4efdd708c06064 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -30,8 +30,8 @@ int init_hex(struct sr_output *o)
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
-                   char **data_out, uint64_t *length_out)
+int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
+            char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;

diff --git a/output/text/text.h b/output/text/text.h
index b8b6d3b8b1b7914a8444f1822ada2992f32eeb6c..c166d853117d566a685800105f787677cb27ba9c 100644 (file)
--- a/output/text/text.h
+++ b/output/text/text.h
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef TEXT_H_
 #define TEXT_H_
 
@@ -54,16 +53,15 @@ int event(struct sr_output *o, int event_type, char **data_out,
 
 
 int init_bits(struct sr_output *o);
-int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
+int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
                     char **data_out, uint64_t *length_out);
 
 int init_hex(struct sr_output *o);
-int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
+int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
                     char **data_out, uint64_t *length_out);
 
 int init_ascii(struct sr_output *o);
-int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
+int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
                     char **data_out, uint64_t *length_out);
 
-
-#endif /* TEXT_H_ */
+#endif

diff --git a/session_driver.c b/session_driver.c
index 56740fa54a551bcab53c89868d8dd6639362710b..fa1b9065dac8c381744a97cff728b0127bd8fcef 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -111,7 +111,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
 
 /* driver callbacks */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
 
        sessionfile = g_strdup(deviceinfo);

diff --git a/sigrok.h b/sigrok.h
index 81709b3e6989536a78bd99780d4d56a53b2e7ee8..ba571c2c79eeb4ca23f2e99b34de93856890d51f 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -157,8 +157,8 @@ struct sr_output_format {
        char *description;
        int df_type;
        int (*init) (struct sr_output *o);
-       int (*data) (struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out);
+       int (*data) (struct sr_output *o, const char *data_in,
+                    uint64_t length_in, char **data_out, uint64_t *length_out);
        int (*event) (struct sr_output *o, int event_type, char **data_out,
                      uint64_t *length_out);
 };
@@ -326,7 +326,7 @@ struct sr_device_plugin {
        char *name;
        char *longname;
        int api_version;
-       int (*init) (char *deviceinfo);
+       int (*init) (const char *deviceinfo);
        void (*cleanup) (void);
 
        /* Device-specific */