From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 22 Mar 2011 01:51:39 +0000 (+1030)
Subject: iscsi: fix warnings with -Wwrite-strings
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=19efa835ec7737d625e9a495a29a301c5465f8f5

iscsi: fix warnings with -Wwrite-strings

Simplest fix is to use const where possible, and use a different var for
asprintf and string literals in login.c.
---

diff --git a/ccan/iscsi/discovery.c b/ccan/iscsi/discovery.c
index 2f2952f5..7b2ad231 100644
--- a/ccan/iscsi/discovery.c
+++ b/ccan/iscsi/discovery.c
@@ -26,7 +26,7 @@
 int iscsi_discovery_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *private_data)
 {
 	struct iscsi_pdu *pdu;
-	char *str;
+	const char *str;
 
 	if (iscsi == NULL) {
 		printf("trying to send text on NULL context\n");
diff --git a/ccan/iscsi/iscsi-private.h b/ccan/iscsi/iscsi-private.h
index 090d3c46..2c04c124 100644
--- a/ccan/iscsi/iscsi-private.h
+++ b/ccan/iscsi/iscsi-private.h
@@ -122,9 +122,9 @@ void iscsi_pdu_set_cmdsn(struct iscsi_pdu *pdu, uint32_t cmdsn);
 void iscsi_pdu_set_lun(struct iscsi_pdu *pdu, uint32_t lun);
 void iscsi_pdu_set_expstatsn(struct iscsi_pdu *pdu, uint32_t expstatsnsn);
 void iscsi_pdu_set_expxferlen(struct iscsi_pdu *pdu, uint32_t expxferlen);
-int iscsi_pdu_add_data(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, unsigned char *dptr, int dsize);
+int iscsi_pdu_add_data(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, const unsigned char *dptr, int dsize);
 int iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
-int iscsi_add_data(struct iscsi_data *data, unsigned char *dptr, int dsize, int pdualignment);
+int iscsi_add_data(struct iscsi_data *data, const unsigned char *dptr, int dsize, int pdualignment);
 int iscsi_set_random_isid(struct iscsi_context *iscsi);
 
 struct scsi_task;
diff --git a/ccan/iscsi/login.c b/ccan/iscsi/login.c
index 1fdf35ca..db9ee8fc 100644
--- a/ccan/iscsi/login.c
+++ b/ccan/iscsi/login.c
@@ -27,7 +27,8 @@
 int iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *private_data)
 {
 	struct iscsi_pdu *pdu;
-	char *str;
+	const char *str;
+	char *astr;
 	int ret;
 
 	if (iscsi == NULL) {
@@ -63,13 +64,13 @@ int iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *pr
 
 
 	/* initiator name */
-	if (asprintf(&str, "InitiatorName=%s", iscsi->initiator_name) == -1) {
+	if (asprintf(&astr, "InitiatorName=%s", iscsi->initiator_name) == -1) {
 		printf("asprintf failed\n");
 		iscsi_free_pdu(iscsi, pdu);
 		return -5;
 	}
-	ret = iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)str, strlen(str)+1);
-	free(str);
+	ret = iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)astr, strlen(astr)+1);
+	free(astr);
 	if (ret != 0) {
 		printf("pdu add data failed\n");
 		iscsi_free_pdu(iscsi, pdu);
@@ -78,13 +79,13 @@ int iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *pr
 
 	/* optional alias */
 	if (iscsi->alias) {
-		if (asprintf(&str, "InitiatorAlias=%s", iscsi->alias) == -1) {
+		if (asprintf(&astr, "InitiatorAlias=%s", iscsi->alias) == -1) {
 			printf("asprintf failed\n");
 			iscsi_free_pdu(iscsi, pdu);
 			return -7;
 		}
-		ret = iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)str, strlen(str)+1);
-		free(str);
+		ret = iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)astr, strlen(astr)+1);
+		free(astr);
 		if (ret != 0) {
 			printf("pdu add data failed\n");
 			iscsi_free_pdu(iscsi, pdu);
@@ -100,13 +101,13 @@ int iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *pr
 			return -9;
 		}
 
-		if (asprintf(&str, "TargetName=%s", iscsi->target_name) == -1) {
+		if (asprintf(&astr, "TargetName=%s", iscsi->target_name) == -1) {
 			printf("asprintf failed\n");
 			iscsi_free_pdu(iscsi, pdu);
 			return -10;
 		}
-		ret = iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)str, strlen(str)+1);
-		free(str);
+		ret = iscsi_pdu_add_data(iscsi, pdu, (unsigned char *)astr, strlen(astr)+1);
+		free(astr);
 		if (ret != 0) {
 			printf("pdu add data failed\n");
 			iscsi_free_pdu(iscsi, pdu);
diff --git a/ccan/iscsi/pdu.c b/ccan/iscsi/pdu.c
index 4d1802a9..819065e7 100644
--- a/ccan/iscsi/pdu.c
+++ b/ccan/iscsi/pdu.c
@@ -88,7 +88,7 @@ void iscsi_free_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
 }
 
 
-int iscsi_add_data(struct iscsi_data *data, unsigned char *dptr, int dsize, int pdualignment)
+int iscsi_add_data(struct iscsi_data *data, const unsigned char *dptr, int dsize, int pdualignment)
 {
 	int len, aligned;
 	unsigned char *buf;
@@ -123,7 +123,7 @@ int iscsi_add_data(struct iscsi_data *data, unsigned char *dptr, int dsize, int
 	return 0;
 }
 
-int iscsi_pdu_add_data(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, unsigned char *dptr, int dsize)
+int iscsi_pdu_add_data(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, const unsigned char *dptr, int dsize)
 {
 	if (pdu == NULL) {
 		printf("trying to add data to NULL pdu\n");