X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fiscsi%2Flogin.c;h=db9ee8fcfccb56c1336ca5c1144ff1768d70e4fe;hp=5863d88331db4ffd2a46be54a241ca4922afac81;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=5d4a434d90373bc99e4bacc97eca5a4abddd700f

diff --git a/ccan/iscsi/login.c b/ccan/iscsi/login.c
index 5863d883..db9ee8fc 100644
--- a/ccan/iscsi/login.c
+++ b/ccan/iscsi/login.c
@@ -15,7 +15,7 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#define _GNU_SOURCE
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -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;
 	}
 
@@ -268,7 +269,7 @@ int iscsi_logout_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *p
 	return 0;
 }
 
-int iscsi_process_logout_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, const unsigned char *hdr, int size UNNEEDED_ATTRIBUTE)
+int iscsi_process_logout_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, const unsigned char *hdr, int size UNUSED)
 {
 	iscsi->is_loggedin = 0;
 	pdu->callback(iscsi, ISCSI_STATUS_GOOD, NULL, pdu->private_data);