Consistently use const char * for read-only strings.

jsonn · jsonn · commit a1da17141378 · 2017-01-20T14:53:17.000+01:00
diff --git a/mdata_delete.c b/mdata_delete.c
@@ -57,7 +57,7 @@ main(int argc, char **argv)
 	mdata_proto_t *mdp;
 	mdata_response_t mdr;
 	string_t *data;
-	char *errmsg = NULL;
+	const char *errmsg = NULL;
 
 	if (argc < 2) {
 		errx(MDEC_USAGE_ERROR, "Usage: %s <keyname>", argv[0]);
diff --git a/mdata_get.c b/mdata_get.c
@@ -63,7 +63,7 @@ main(int argc, char **argv)
 	mdata_proto_t *mdp;
 	mdata_response_t mdr;
 	string_t *data;
-	char *errmsg = NULL;
+	const char *errmsg = NULL;
 
 	if (argc < 2) {
 		errx(MDEC_USAGE_ERROR, "Usage: %s <keyname>", argv[0]);
diff --git a/mdata_list.c b/mdata_list.c
@@ -60,7 +60,7 @@ main(int argc __UNUSED, char **argv __UNUSED)
 	mdata_proto_t *mdp;
 	mdata_response_t mdr;
 	string_t *data;
-	char *errmsg = NULL;
+	const char *errmsg = NULL;
 
 	if (proto_init(&mdp, &errmsg) != 0) {
 		fprintf(stderr, "ERROR: could not initialise protocol: %s\n",
diff --git a/mdata_put.c b/mdata_put.c
@@ -58,7 +58,7 @@ main(int argc, char **argv)
 	mdata_proto_t *mdp;
 	mdata_response_t mdr;
 	string_t *data;
-	char *errmsg = NULL;
+	const char *errmsg = NULL;
 	string_t *req = dynstr_new();
 
 	if (argc < 2) {
diff --git a/plat.h b/plat.h
@@ -17,7 +17,7 @@ typedef struct mdata_plat mdata_plat_t;
 int plat_is_interactive(void);
 
 /*int open_metadata_stream(FILE **fp, char **err);*/
-int plat_init(mdata_plat_t **, char **er, int *);
+int plat_init(mdata_plat_t **, const char **er, int *);
 int plat_recv(mdata_plat_t *, string_t *, int);
 int plat_send(mdata_plat_t *, string_t *);
 void plat_fini(mdata_plat_t *);
diff --git a/plat/bsd.c b/plat/bsd.c
@@ -145,7 +145,7 @@ plat_is_interactive(void)
 }
 
 int
-plat_init(mdata_plat_t **mplout, char **errmsg, int *permfail)
+plat_init(mdata_plat_t **mplout, const char **errmsg, int *permfail)
 {
 	mdata_plat_t *mpl = NULL;
 
diff --git a/plat/linux.c b/plat/linux.c
@@ -132,7 +132,7 @@ plat_is_interactive(void)
 }
 
 int
-plat_init(mdata_plat_t **mplout, char **errmsg, int *permfail)
+plat_init(mdata_plat_t **mplout, const char **errmsg, int *permfail)
 {
 	mdata_plat_t *mpl = NULL;
 	struct epoll_event event;
diff --git a/plat/sunos.c b/plat/sunos.c
@@ -281,7 +281,7 @@ plat_is_interactive(void)
 }
 
 int
-plat_init(mdata_plat_t **mplout, char **errmsg, int *permfail)
+plat_init(mdata_plat_t **mplout, const char **errmsg, int *permfail)
 {
 	char *product;
 	boolean_t smartdc_hvm_guest = B_FALSE;
diff --git a/plat/unix_common.c b/plat/unix_common.c
@@ -19,6 +19,7 @@
 #include "common.h"
 #include "plat.h"
 #include "dynstr.h"
+#include "unix_common.h"
 
 int
 unix_is_interactive(void)
@@ -27,7 +28,7 @@ unix_is_interactive(void)
 }
 
 static int
-unix_raw_mode(int fd, char **errmsg)
+unix_raw_mode(int fd, const char **errmsg)
 {
 	struct termios tios;
 
@@ -58,7 +59,7 @@ unix_raw_mode(int fd, char **errmsg)
 }
 
 int
-unix_open_serial(char *devpath, int *outfd, char **errmsg, int *permfail)
+unix_open_serial(const char *devpath, int *outfd, const char **errmsg, int *permfail)
 {
 	int fd;
 	char scrap[100];
diff --git a/plat/unix_common.h b/plat/unix_common.h
@@ -13,8 +13,7 @@ extern "C" {
 #include "plat.h"
 #include "dynstr.h"
 
-/*int unix_raw_mode(int fd, char **errmsg);*/
-int unix_open_serial(char *devpath, int *outfd, char **errmsg, int *permfail);
+int unix_open_serial(const char *devpath, int *outfd, const char **errmsg, int *permfail);
 int unix_send_reset(mdata_plat_t *mpl);
 int unix_is_interactive(void);
 
diff --git a/proto.c b/proto.c
@@ -60,8 +60,8 @@ struct mdata_proto {
 	mdata_proto_state_t mdp_state;
 	mdata_proto_version_t mdp_version;
 	boolean_t mdp_in_reset;
-	char *mdp_errmsg;
-	char *mdp_parse_errmsg;
+	const char *mdp_errmsg;
+	const char *mdp_parse_errmsg;
 };
 
 static int proto_send(mdata_proto_t *mdp);
@@ -151,6 +151,7 @@ proto_parse_v2(mdata_proto_t *mdp, string_t *input, string_t *request_id,
     string_t *command, string_t *response_data)
 {
 	const char *endp = dynstr_cstr(input);
+	char *endp2;
 	unsigned long clen;
 	uint32_t crc32;
 
@@ -165,10 +166,11 @@ proto_parse_v2(mdata_proto_t *mdp, string_t *input, string_t *request_id,
 	/*
 	 * Read Content Length:
 	 */
-	if ((clen = strtoul(endp, (char **) &endp, 10)) == 0) {
+	if ((clen = strtoul(endp, &endp2, 10)) == 0) {
 		mdp->mdp_parse_errmsg = "invalid content length";
 		return (-1);
 	}
+	endp = endp2;
 
 	/*
 	 * Skip whitespace:
@@ -179,10 +181,11 @@ proto_parse_v2(mdata_proto_t *mdp, string_t *input, string_t *request_id,
 	/*
 	 * Read CRC32 checksum:
 	 */
-	if ((crc32 = strtoul(endp, (char **) &endp, 16)) == 0) {
+	if ((crc32 = strtoul(endp, &endp2, 16)) == 0) {
 		mdp->mdp_parse_errmsg = "invalid crc32 in frame";
 		return (-1);
 	}
+	endp = endp2;
 
 	/*
 	 * Skip whitespace:
@@ -571,7 +574,7 @@ proto_version(mdata_proto_t *mdp)
 }
 
 int
-proto_init(mdata_proto_t **out, char **errmsg)
+proto_init(mdata_proto_t **out, const char **errmsg)
 {
 	mdata_proto_t *mdp;
 
diff --git a/proto.h b/proto.h
@@ -21,7 +21,7 @@ typedef enum mdata_response {
 
 typedef struct mdata_proto mdata_proto_t;
 
-int proto_init(mdata_proto_t **, char **);
+int proto_init(mdata_proto_t **, const char **);
 int proto_version(mdata_proto_t *);
 int proto_execute(mdata_proto_t *, const char *, const char *, mdata_response_t *,
     string_t **);

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ plat_is_interactive(void)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`int`
`148`		`-plat_init(mdata_plat_t mplout, char errmsg, int *permfail)`
	`148`	`+plat_init(mdata_plat_t mplout, const char errmsg, int *permfail)`
`149`	`149`	`{`
`150`	`150`	`mdata_plat_t *mpl = NULL;`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ plat_is_interactive(void)`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`int`
`135`		`-plat_init(mdata_plat_t mplout, char errmsg, int *permfail)`
	`135`	`+plat_init(mdata_plat_t mplout, const char errmsg, int *permfail)`
`136`	`136`	`{`
`137`	`137`	`mdata_plat_t *mpl = NULL;`
`138`	`138`	`struct epoll_event event;`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ plat_is_interactive(void)`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`int`
`284`		`-plat_init(mdata_plat_t mplout, char errmsg, int *permfail)`
	`284`	`+plat_init(mdata_plat_t mplout, const char errmsg, int *permfail)`
`285`	`285`	`{`
`286`	`286`	`char *product;`
`287`	`287`	`boolean_t smartdc_hvm_guest = B_FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "common.h"`
`20`	`20`	`#include "plat.h"`
`21`	`21`	`#include "dynstr.h"`
	`22`	`+#include "unix_common.h"`
`22`	`23`
`23`	`24`	`int`
`24`	`25`	`unix_is_interactive(void)`
`@@ -27,7 +28,7 @@ unix_is_interactive(void)`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`static int`
`30`		`-unix_raw_mode(int fd, char **errmsg)`
	`31`	`+unix_raw_mode(int fd, const char **errmsg)`
`31`	`32`	`{`
`32`	`33`	`struct termios tios;`
`33`	`34`
`@@ -58,7 +59,7 @@ unix_raw_mode(int fd, char **errmsg)`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`int`
`61`		`-unix_open_serial(char devpath, int outfd, char *errmsg, int permfail)`
	`62`	`+unix_open_serial(const char devpath, int outfd, const char *errmsg, int permfail)`
`62`	`63`	`{`
`63`	`64`	`int fd;`
`64`	`65`	`char scrap[100];`