From 0629d44e83cfbf68d00eb47e90e14c00874d209d Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Thu, 18 Feb 2016 21:50:35 -0800
Subject: [PATCH] Remove C99 style variable declarations

Make it slightly more portable and move the declarations to the start of the
function.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
---
 lib/connect.c |  3 ++-
 lib/socket.c  | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/connect.c b/lib/connect.c
index e98a338..a1abbf6 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -297,6 +297,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi)
 void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status,
                         void *command_data _U_, void *private_data _U_)
 {
+        struct iscsi_context *old_iscsi;
 	int i;
 
 	if (status != SCSI_STATUS_GOOD) {
@@ -319,7 +320,7 @@ void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status,
 		return;
 	}
 
-	struct iscsi_context *old_iscsi = iscsi->old_iscsi;
+	old_iscsi = iscsi->old_iscsi;
 	iscsi->old_iscsi = NULL;
 
 	while (old_iscsi->outqueue) {
diff --git a/lib/socket.c b/lib/socket.c
index b888f77..ea936a8 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -442,7 +442,13 @@ iscsi_queue_length(struct iscsi_context *iscsi)
 ssize_t
 iscsi_iovector_readv_writev(struct iscsi_context *iscsi, struct scsi_iovector *iovector, uint32_t pos, ssize_t count, int do_write)
 {
-	if (iovector->iov == NULL) {
+        struct scsi_iovec *iov, *iov2;
+        int niov;
+        uint32_t len2;
+        size_t _len2;
+        ssize_t n;
+
+        if (iovector->iov == NULL) {
 		errno = EINVAL;
 		return -1;
 	}
@@ -463,7 +469,7 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscsi, struct scsi_iovector *i
 	}
 
 	/* iov is a pointer to the first iovec to pass */
-	struct scsi_iovec *iov = &iovector->iov[iovector->consumed];
+	iov = &iovector->iov[iovector->consumed];
 	pos -= iovector->offset;
 
 	/* forward until iov points to the first iov to pass */
@@ -478,11 +484,9 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscsi, struct scsi_iovector *i
 		iov = &iovector->iov[iovector->consumed];
 	}
 
-	/* iov2 is a pointer to the last iovec to pass */
-	struct scsi_iovec *iov2 = iov;
-
-	int niov=1; /* number of iovectors to pass */
-	uint32_t len2 = pos + count; /* adjust length of iov2 */
+	iov2 = iov;         /* iov2 is a pointer to the last iovec to pass */
+	niov = 1;           /* number of iovectors to pass */
+	len2 = pos + count; /* adjust length of iov2 */
 
 	/* forward until iov2 points to the last iovec we pass later. it might
 	   happen that we have a lot of iovectors but are limited by count */
@@ -498,14 +502,13 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscsi, struct scsi_iovector *i
 
 	/* we might limit the length of the last iovec we pass to readv/writev
 	   store its orignal length to restore it later */
-	size_t _len2 = iov2->iov_len;
+	_len2 = iov2->iov_len;
 
 	/* adjust base+len of start iovec and len of last iovec */
 	iov2->iov_len = len2;
 	iov->iov_base = (void*) ((uintptr_t)iov->iov_base + pos);
 	iov->iov_len -= pos;
 
-	ssize_t n;
 	if (do_write) {
 		n = writev(iscsi->fd, (struct iovec*) iov, niov);
 	} else {