X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fiscsi%2Flogin.c;h=db9ee8fcfccb56c1336ca5c1144ff1768d70e4fe;hb=b87e14495d5b07e1b247218a72329f10ecb3da7f;hp=bc0d6ffa6acfad065fd9a5dcc379f79c5f4f2954;hpb=a40b318e7a07a452ae7456053727bd11b2fa49b4;p=ccan
diff --git a/ccan/iscsi/login.c b/ccan/iscsi/login.c
index bc0d6ffa..db9ee8fc 100644
--- a/ccan/iscsi/login.c
+++ b/ccan/iscsi/login.c
@@ -15,7 +15,7 @@
along with this program; if not, see .
*/
-#define _GNU_SOURCE
+#include "config.h"
#include
#include
#include
@@ -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);
@@ -205,7 +206,7 @@ int iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu
int status;
if (size < ISCSI_HEADER_SIZE) {
- printf("dont have enough data to read status from login reply\n");
+ printf("don't have enough data to read status from login reply\n");
return -1;
}