 @@ -603,33 +603,33 @@ initiator_get_targets(int target, strv_t
+                }
+        }
 	return 1;
+}
 static int
 discovery_phase(int target, strv_t *svp)
+{
 	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);
 		return -1;
+	}
 	sess = g_target[target].sess;
 	if ((text = iscsi_malloc_atomic(DISCOVERY_PHASE_TEXT_LEN)) == NULL) {
 		iscsi_trace_error(__FILE__, __LINE__, "iscsi_malloc_atomic() failed\n");
 		return -1;
+	}
 	/* Login to target */
 	iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "entering Discovery login phase with target %d (sock %#x)\n", target, (int) sess->sock);
 @@ -1277,27 +1277,27 @@ tx_worker_proc_i(void *arg)
+			}
 			/* Get initiator command */
 			if ((cmd = iscsi_queue_remove(&g_target[me->id].sess->tx_queue)) == NULL) {
 				iscsi_trace_error(__FILE__, __LINE__, "tx_worker[%d]: iscsi_queue_remove() failed\n", me->id);
 				ISCSI_UNLOCK(&me->work_mutex, return -1);
 				goto done;
+			}
 			ISCSI_UNLOCK(&me->work_mutex, return -1);
 			iscsi_trace(TRACE_ISCSI_CMD, __FILE__, __LINE__, "tx_worker[%d]: dequeued initiator_cmd_t 0x%p (type %d, target %llu)\n", me->id, cmd, cmd->type, cmd->isid);
 			/* 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;
+			}
 			/*
 			 * Add to list of oustanding commands in session
 			 * (unless NOP_OUT without ping)
 			 */
 			if (!((cmd->type == ISCSI_NOP_OUT) && (((iscsi_nop_out_args_t *) (cmd->ptr))->tag == 0xffffffff))) {
 				cmd->next = NULL;
 				iscsi_spin_lock(&sess->cmds_spin);
 				for (ptr = sess->cmds; ((ptr) && (ptr->next != NULL)); ptr = ptr->next) {
+				}
 @@ -1569,27 +1569,27 @@ text_command_i(initiator_cmd_t * cmd)
 	if (hash_insert(&g_tag_hash, cmd, text_cmd->tag) != 0) {
 		iscsi_trace_error(__FILE__, __LINE__, "hash_insert() failed\n");
 		return -1;
+	}
 	/* Send text command PDU */
 	text_cmd->ExpStatSN = sess->ExpStatSN;
 	text_cmd->CmdSN = sess->CmdSN++;
 	iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sending text command\n");
 	if (iscsi_text_cmd_encap(header, text_cmd) != 0) {
 		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;
+	}
 	iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "text command sent ok\n");
 	return 0;
+}
 static int
 login_command_i(initiator_cmd_t * cmd)
+{
 	iscsi_login_cmd_args_t *login_cmd = (iscsi_login_cmd_args_t *) cmd->ptr;
 @@ -1603,27 +1603,27 @@ login_command_i(initiator_cmd_t * cmd)
 	/* retreive the cmd ptr using the tag from the response PDU. */
 	if (hash_insert(&g_tag_hash, cmd, login_cmd->tag) != 0) {
 		iscsi_trace_error(__FILE__, __LINE__, "hash_insert() failed\n");
 		return -1;
+	}
 	/* Send login command PDU */
 	login_cmd->ExpStatSN = sess->ExpStatSN;
 	iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sending login command\n");
 	if (iscsi_login_cmd_encap(header, login_cmd) != 0) {
 		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;
+	}
 	iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "login command sent ok\n");
 	return 0;
+}
 static int
 logout_phase_i(initiator_session_t * sess)
+{
 	initiator_cmd_t *cmd = NULL;
 @@ -2317,32 +2317,32 @@ scsi_command_i(initiator_cmd_t * cmd)
 		if (modify_iov(&sg_copy, &sg_len_copy, 0, scsi_cmd->length) != 0) {
 			iscsi_trace_error(__FILE__, __LINE__, "modify_iov() failed\n");
 			goto error;
+		}
 		if (scsi_cmd->ahs) {
 			if (iscsi_sock_msg(sess->sock, 1, ISCSI_HEADER_LEN, header, 0) != ISCSI_HEADER_LEN) {
 				iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 				goto error;
+			}
 			if (iscsi_sock_msg(sess->sock, 1, scsi_cmd->ahs_len, scsi_cmd->ahs, 0) != scsi_cmd->ahs_len) {
 				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;
+			}
+		}
 		scsi_cmd->bytes_sent += scsi_cmd->length;
 	} else {
 		if (iscsi_sock_msg(sess->sock, 1, ISCSI_HEADER_LEN, header, 0) != ISCSI_HEADER_LEN) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_sock_msg() failed\n");
 			goto error;
+		}
 		if (scsi_cmd->ahs_len) {
 			if (iscsi_sock_msg(sess->sock, 1, scsi_cmd->ahs_len, scsi_cmd->ahs, 0) != scsi_cmd->ahs_len) {
 @@ -2439,27 +2439,27 @@ scsi_command_i(initiator_cmd_t * cmd)
 				/*
 				 * Data was not fragmented; use the original
 				 * iovec.
 				 */
 				sg_which = sg;
 				sg_len_which = sg_len;
+			}
 			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;
+			}
 			iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sent write data PDU (offset %u, len %u)\n", data.offset, data.length);
 			scsi_cmd->bytes_sent += data.length;
 		} while ((scsi_cmd->bytes_sent < scsi_cmd->trans_len)
 			 && ((scsi_cmd->bytes_sent < sess->sess_params.first_burst_length)
 			     || (!sess->sess_params.first_burst_length)));
 		if (scsi_cmd->trans_len - scsi_cmd->bytes_sent) {
 			iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "REACHED FIRST BURST\n");
+		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "successfully sent %u of %u bytes write data\n", scsi_cmd->bytes_sent, scsi_cmd->trans_len);
 @@ -2546,27 +2546,27 @@ async_msg_i(initiator_session_t * sess,
+	}
 	sess->CmdSN = msg.ExpCmdSN;
 	sess->MaxCmdSN = msg.MaxCmdSN;
 	sess->ExpStatSN = msg.StatSN + 1;
 	/* Read Sense Data */
 	if (msg.length) {
 		uint8_t  *sense_data = NULL;
 		if ((sense_data = iscsi_malloc(msg.length)) == NULL) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_malloc() failed\n");
 			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);
 			return -1;
+		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "read %d bytes sense data ok (currently discarding)\n", msg.length);
 		if (sense_data != NULL)
 			iscsi_free(sense_data);
 	} else {
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "no sense data available\n");
+	}
 	switch (msg.AsyncEvent) {
 @@ -2589,48 +2589,48 @@ async_msg_i(initiator_session_t * sess,
 	default:
 		break;
+	}
 	return 0;
+}
 static int
 nop_in_i(initiator_session_t * sess, initiator_cmd_t * cmd, uint8_t *header)
+{
 	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;
 	} else {
 		iscsi_trace_error(__FILE__, __LINE__, "no initiator_cmd_t associated with this NOP_IN\n");
+	}
 	if (iscsi_nop_in_decap(header, &nop_in) != 0) {
 		iscsi_trace_error(__FILE__, __LINE__, "iscsi_nop_in() failed\n");
 		return -1;
+	}
 	if (cmd)
 		RETURN_NOT_EQUAL("nop_in.length", nop_in.length, nop_out->length, NO_CLEANUP, -1);
 	if (nop_in.length) {
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "reading %d bytes ping data\n", nop_in.length);
 		if ((ping_data = iscsi_malloc_atomic(nop_in.length)) == NULL) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_malloc_atomic() failed\n");
 			return -1;
+		}
 #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;
+		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "successfully read %d bytes ping data\n", nop_in.length);
 		if (cmd) {
 			for (i = 0; i < nop_in.length; i++) {
 				if (nop_out->data[i] != ping_data[i]) {
 					iscsi_trace_error(__FILE__, __LINE__, "Bad ping data[%d]. Got %#x, expected %#x\n", i, ping_data[i], nop_out->data[i]);
 					NOI_ERROR;
+				}
+			}
+		}
+	}
 @@ -2644,27 +2644,27 @@ nop_in_i(initiator_session_t * sess, ini
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sending %d byte ping response\n", nop_in.length);
 		(void) memset(&nop_out_args, 0x0, sizeof(nop_out_args));
 		nop_out_args.tag = 0xffffffff;
 		nop_out_args.immediate = 0x40;
 		nop_out_args.transfer_tag = nop_in.transfer_tag;
 		nop_out_args.length = nop_in.length;
 		nop_out_args.lun = nop_in.lun;
 		nop_out_args.ExpStatSN = sess->ExpStatSN;
 		nop_out_args.CmdSN = sess->CmdSN;
 		if (iscsi_nop_out_encap(nop_header, &nop_out_args) != 0) {
 			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;
+		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "successfully sent %d byte ping response\n", nop_in.length);
+	}
 	NOI_CLEANUP;
 	/* Check and update numbering  */
 	sess->ExpStatSN = nop_in.StatSN + 1;
 	/*
 	 * RETURN_NOT_EQUAL("StatSN", nop_in.StatSN, sess->ExpStatSN++,
 	 * NO_CLEANUP, -1);
 	 */
 	sess->CmdSN = nop_in.ExpCmdSN;
 @@ -2809,27 +2809,27 @@ scsi_r2t_i(initiator_session_t * sess, i
 				FF_CLEANUP;
 				return -1;
+			}
 			sg_which = sg_copy;
 			sg_len_which = sg_len_copy;
 		} else {
 			iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "using original iovec for R2T transfer (offset %u, length %u)\n",
 			      r2t.offset, r2t.length);
 			sg_which = sg;
 			sg_len_which = sg_len;
+		}
 		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;
 			return -1;
+		}
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "sent write data PDU OK (offset %u, len %u)\n", data.offset, data.length);
 		bytes_sent += data.length;
 		scsi_cmd->bytes_sent += data.length;
 	} while (bytes_sent < r2t.length);
 	FF_CLEANUP;
 	if (hash_insert(&g_tag_hash, cmd, scsi_cmd->tag) != 0) {
 		iscsi_trace_error(__FILE__, __LINE__, "hash_insert() failed\n");
 		return -1;
 @@ -2899,27 +2899,27 @@ scsi_response_i(initiator_session_t * se
 		} else if (scsi_cmd->input) {
+		}
 	} else if (scsi_rsp.length) {
 		uint8_t  *sense_data = NULL;
 		if ((sense_data = iscsi_malloc(scsi_rsp.length)) == NULL) {
 			iscsi_trace_error(__FILE__, __LINE__, "iscsi_malloc() failed\n");
 			return -1;
+		}
 		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);
 			return -1;
+		}
 		iscsi_trace_error(__FILE__, __LINE__, "read %d bytes sense data ok (currently discarding)\n", scsi_rsp.length);
 		if (sense_data != NULL)
 			iscsi_free(sense_data);
 	} else {
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "no sense data available\n");
+	}
 	/* Check and update numbering  */
 @@ -3041,39 +3041,39 @@ scsi_read_data_i(initiator_session_t * s
 			total_len = 0;
 			for (i = 0; i < sg_len; i++) {
 				total_len += sg[i].iov_len;
 				if (total_len >= data.length) {
 					break;
+				}
+			}
 			sg[i].iov_len -= (total_len - data.length);
 			sg_len = i + 1;
 		} else {
 			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);
 			return -1;
+		}
 		scsi_cmd->bytes_recv += data.length;
 		if (sg_orig)
 			iscsi_free_atomic(sg_orig);
 	} 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;
+			}
 			scsi_cmd->bytes_recv += data.length;
+		}
+	}
 	/* Check for status */
 	if (data.S_bit) {
 		iscsi_trace(TRACE_ISCSI_DEBUG, __FILE__, __LINE__, "received status with final PDU\n");
 		RETURN_NOT_EQUAL("Final Bit", data.final, 1, NO_CLEANUP, -1);