@@ -613,13 +613,13 @@
 	initiator_session_t	*sess;
 	iscsi_parameter_value_t	*vp;
 	iscsi_parameter_t	*ip;
+	unsigned		 i;
 	char           		*ptr;
 	char           		*colon_ptr;
 	char           		*comma_ptr;
 	char            	 port[64];
 	char           		*text = NULL;
 	int             	 text_len = 0;
-	int			 i;
 
 	if (target >= CONFIG_INITIATOR_NUM_TARGETS) {
 		iscsi_trace_error(__FILE__, __LINE__, "target (%d) out of range [0..%d]\n", target, CONFIG_INITIATOR_NUM_TARGETS);
@@ -1287,7 +1287,7 @@
 
 			/* Make sure we've got the right command */
 
-			if (cmd->isid != me->id) {
+			if (cmd->isid != (unsigned)me->id) {
 				iscsi_trace_error(__FILE__, __LINE__, "got command %#x for target %llu, expected %d\n", cmd->type, cmd->isid, me->id);
 				goto done;
 			}
@@ -1579,7 +1579,7 @@
 		iscsi_trace_error(__FILE__, __LINE__, "(iscsi_text_cmd_encap() failed\n");
 		return -1;
 	}
-	if (iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, text_cmd->text, text_cmd->length, 0)
+	if ((unsigned)iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, text_cmd->text, text_cmd->length, 0)
 	    != ISCSI_HEADER_LEN + text_cmd->length) {
 		iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_send_header_and_data() failed.\n");
 		return -1;
@@ -1613,7 +1613,7 @@
 		iscsi_trace_error(__FILE__, __LINE__, "(iscsi_login_cmd_encap() failed\n");
 		return -1;
 	}
-	if (iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, login_cmd->text, login_cmd->length, 0)
+	if ((unsigned)iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, login_cmd->text, login_cmd->length, 0)
 	    != ISCSI_HEADER_LEN + login_cmd->length) {
 		iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_send_header_and_data() failed.\n");
 		return -1;
@@ -2327,12 +2327,12 @@
 				iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 				goto error;
 			}
-			if (iscsi_sock_msg(sess->sock, 1, scsi_cmd->length, sg_copy, sg_len_copy) != scsi_cmd->length) {
+			if ((unsigned)iscsi_sock_msg(sess->sock, 1, scsi_cmd->length, sg_copy, sg_len_copy) != scsi_cmd->length) {
 				iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 				goto error;
 			}
 		} else {
-			if (iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, sg_copy, scsi_cmd->length, sg_len_copy)
+			if ((unsigned)iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, sg_copy, scsi_cmd->length, sg_len_copy)
 			    != ISCSI_HEADER_LEN + scsi_cmd->length) {
 				iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_send_header_and_data() failed\n");
 				goto error;
@@ -2449,7 +2449,7 @@
 			iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sending write data PDU (offset %u, len %u, sg_len %u)\n",
 			      data.offset, data.length, sg_len_which);
 
-			if (iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, sg_which, data.length, sg_len_which)
+			if ((unsigned)iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, sg_which, data.length, sg_len_which)
 			    != ISCSI_HEADER_LEN + data.length) {
 				iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_send_header_and_data() failed\n");
 				goto error;
@@ -2556,7 +2556,7 @@
 			return -1;
 		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "reading %d bytes sense data \n", msg.length);
-		if (iscsi_sock_msg(sess->sock, 0, msg.length, sense_data, 0) != msg.length) {
+		if ((unsigned)iscsi_sock_msg(sess->sock, 0, msg.length, sense_data, 0) != msg.length) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 			if (sense_data != NULL)
 				iscsi_free(sense_data);
@@ -2599,7 +2599,7 @@
 	iscsi_nop_out_args_t *nop_out = NULL;
 	iscsi_nop_in_args_t  nop_in;
 	uint8_t  *ping_data = NULL;
-	int             i;
+	unsigned             i;
 
 	if (cmd) {
 		nop_out = (iscsi_nop_out_args_t *) cmd->ptr;
@@ -2620,7 +2620,7 @@
 		}
 #define NOI_CLEANUP {if (ping_data) iscsi_free_atomic(ping_data);}
 #define NOI_ERROR {NOI_CLEANUP; return -1;}
-		if (iscsi_sock_msg(sess->sock, 0, nop_in.length, ping_data, 0) != nop_in.length) {
+		if ((unsigned)iscsi_sock_msg(sess->sock, 0, nop_in.length, ping_data, 0) != nop_in.length) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 			NOI_ERROR;
 		}
@@ -2654,7 +2654,7 @@
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_nop_out_encap() failed\n");
 			NOI_ERROR;
 		}
-		if (iscsi_sock_send_header_and_data(sess->sock, nop_header, nop_out_args.length, ping_data, nop_in.length, 0) != nop_in.length) {
+		if ((unsigned)iscsi_sock_send_header_and_data(sess->sock, nop_header, nop_out_args.length, ping_data, nop_in.length, 0) != nop_in.length) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 			NOI_ERROR;
 		}
@@ -2819,7 +2819,7 @@
 		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sending R2T write data PDU (offset %u, len %u, sg_len %u)\n",
 		      data.offset, data.length, sg_len_which);
-		if (iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, sg_which, data.length, sg_len_which)
+		if ((unsigned)iscsi_sock_send_header_and_data(sess->sock, header, ISCSI_HEADER_LEN, sg_which, data.length, sg_len_which)
 		    != ISCSI_HEADER_LEN + data.length) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_send_header_and_data() failed\n");
 			FF_CLEANUP;
@@ -2909,7 +2909,7 @@
 		}
 		iscsi_trace_error(__FILE__, __LINE__, "reading %d bytes sense data (recv_sg_len %u)\n",
 			    scsi_rsp.length, scsi_cmd->recv_sg_len);
-		if (iscsi_sock_msg(sess->sock, 0, scsi_rsp.length, sense_data, 0) != scsi_rsp.length) {
+		if ((unsigned)iscsi_sock_msg(sess->sock, 0, scsi_rsp.length, sense_data, 0) != scsi_rsp.length) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 			if (sense_data != NULL)
 				iscsi_free(sense_data);
@@ -3051,7 +3051,7 @@
 			sg = (struct iovec *) scsi_cmd->recv_data;
 		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "reading %d bytes into sg buffer (total offset %u)\n", data.length, data.offset);
-		if ((rc = iscsi_sock_msg(sess->sock, 0, data.length, (uint8_t *) sg, sg_len)) != data.length) {
+		if ((rc = iscsi_sock_msg(sess->sock, 0, data.length, (uint8_t *) sg, sg_len)) != (int)data.length) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed: got %u, expected %u\n", rc, data.length);
 			if (sg_orig)
 				iscsi_free_atomic(sg_orig);
@@ -3063,7 +3063,7 @@
 	} else {
 		if (data.length) {
 			iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "reading %d bytes into dest buffer (offset %u)\n", data.length, data.offset);
-			if (iscsi_sock_msg(sess->sock, 0, data.length, scsi_cmd->recv_data + data.offset, 0) != data.length) {
+			if (iscsi_sock_msg(sess->sock, 0, data.length, scsi_cmd->recv_data + data.offset, 0) != (int)data.length) {
 				iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 				return -1;
 			}