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 2f2952f50455783acf701d08d274449b70cdb52b..7b2ad2315264ef43ef4caa6efb11ca6e4d43d438 100644 (file)
--- 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 090d3c4692645f9ab6c592828205dec8634a98d6..2c04c1249d311f56298c36564f63b4e022059e2c 100644 (file)
--- 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 1fdf35ca4601a3912b37d83f87efb0a6dde19766..db9ee8fcfccb56c1336ca5c1144ff1768d70e4fe 100644 (file)
--- 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 4d1802a9ce95ece1f93c08ae14cc384c0de5527a..819065e71800f29a3df4d383ff0b933c6d19fffa 100644 (file)
--- 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");