admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove C99 style variable declarations

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

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2016-02-18 21:50:35 -08:00
parent 99a5f99527
commit 0629d44e83
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/connect.c
View File

@@ -297,6 +297,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi)
void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status, void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status,
void *command_data _U_, void *private_data _U_) void *command_data _U_, void *private_data _U_)
{ {
struct iscsi_context *old_iscsi;
int i; int i;
if (status != SCSI_STATUS_GOOD) { if (status != SCSI_STATUS_GOOD) {
@@ -319,7 +320,7 @@ void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status,
return; return;
} }
struct iscsi_context *old_iscsi = iscsi->old_iscsi; old_iscsi = iscsi->old_iscsi;
iscsi->old_iscsi = NULL; iscsi->old_iscsi = NULL;
while (old_iscsi->outqueue) { while (old_iscsi->outqueue) {

21
lib/socket.c
View File

@@ -442,7 +442,13 @@ iscsi_queue_length(struct iscsi_context *iscsi)
ssize_t ssize_t
iscsi_iovector_readv_writev(struct iscsi_context *iscsi, struct scsi_iovector *iovector, uint32_t pos, ssize_t count, int do_write) 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; errno = EINVAL;
return -1; 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 */ /* 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; pos -= iovector->offset;
/* forward until iov points to the first iov to pass */ /* 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]; iov = &iovector->iov[iovector->consumed];
} }
/* iov2 is a pointer to the last iovec to pass */ iov2 = iov; /* iov2 is a pointer to the last iovec to pass */
struct scsi_iovec *iov2 = iov; niov = 1; /* number of iovectors to pass */
len2 = pos + count; /* adjust length of iov2 */
int niov=1; /* number of iovectors to pass */
uint32_t len2 = pos + count; /* adjust length of iov2 */
/* forward until iov2 points to the last iovec we pass later. it might /* 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 */ 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 /* we might limit the length of the last iovec we pass to readv/writev
store its orignal length to restore it later */ 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 */ /* adjust base+len of start iovec and len of last iovec */
iov2->iov_len = len2; iov2->iov_len = len2;
iov->iov_base = (void*) ((uintptr_t)iov->iov_base + pos); iov->iov_base = (void*) ((uintptr_t)iov->iov_base + pos);
iov->iov_len -= pos; iov->iov_len -= pos;
ssize_t n;
if (do_write) { if (do_write) {
n = writev(iscsi->fd, (struct iovec*) iov, niov); n = writev(iscsi->fd, (struct iovec*) iov, niov);
} else { } else {