Remove trailing blanks

The files touched here need a bug fix which is applied with the
following patch.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil
2015-03-07 09:32:14 +01:00
parent 54e32122d3
commit d7a8ab0f1e
5 changed files with 48 additions and 48 deletions

View File

@@ -1,16 +1,16 @@
/*
/*
Copyright (C) 2010 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
}
iscsi_url = iscsi_parse_full_url(client.src_iscsi, src_url);
if (iscsi_url == NULL) {
fprintf(stderr, "Failed to parse URL: %s\n",
fprintf(stderr, "Failed to parse URL: %s\n",
iscsi_get_error(client.src_iscsi));
exit(10);
}
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
}
iscsi_url = iscsi_parse_full_url(client.dst_iscsi, dst_url);
if (iscsi_url == NULL) {
fprintf(stderr, "Failed to parse URL: %s\n",
fprintf(stderr, "Failed to parse URL: %s\n",
iscsi_get_error(client.dst_iscsi));
exit(10);
}

View File

@@ -74,7 +74,7 @@ int open(const char *path, int flags, mode_t mode)
if (mode & O_NONBLOCK) {
LD_ISCSI_DPRINTF(0,"Non-blocking I/O is currently not supported");
errno = EINVAL;
return -1;
return -1;
}
iscsi = iscsi_create_context(initiator);
@@ -131,7 +131,7 @@ int open(const char *path, int flags, mode_t mode)
errno = EIO;
return -1;
}
LD_ISCSI_DPRINTF(4,"readcapacity16_sync: block_size: %d, num_blocks: %"PRIu64,rc16->block_length,rc16->returned_lba + 1);
fd = iscsi_get_fd(iscsi);
@@ -141,7 +141,7 @@ int open(const char *path, int flags, mode_t mode)
iscsi_destroy_context(iscsi);
errno = ENFILE;
return -1;
}
}
iscsi_fd_list[fd].is_iscsi = 1;
iscsi_fd_list[fd].dup2fd = -1;
@@ -263,7 +263,7 @@ int __lxstat(int ver, const char *path, struct stat *buf)
ret = __fxstat(ver, fd, buf);
close(fd);
return ret;
return ret;
}
return real_lxstat(ver, path, buf);
@@ -303,7 +303,7 @@ off_t lseek(int fd, off_t offset, int whence) {
iscsi_fd_list[fd].offset=new_offset;
return iscsi_fd_list[fd].offset;
}
return real_lseek(fd, offset, whence);
}
@@ -415,7 +415,7 @@ ssize_t read(int fd, void *buf, size_t count)
return real_read(fd, buf, count);
}
ssize_t (*real_pread)(int fd, void *buf, size_t count, off_t offset);
ssize_t (*real_pread)(int fd, void *buf, size_t count, off_t offset);
ssize_t pread(int fd, void *buf, size_t count, off_t offset) {
if ((iscsi_fd_list[fd].is_iscsi == 1 && iscsi_fd_list[fd].in_flight == 0)) {
off_t old_offset;
@@ -438,7 +438,7 @@ ssize_t pread(int fd, void *buf, size_t count, off_t offset) {
ssize_t (*real_write)(int fd, const void *buf, size_t count);
ssize_t write(int fd, const void *buf, size_t count)
ssize_t write(int fd, const void *buf, size_t count)
{
if ((iscsi_fd_list[fd].is_iscsi == 1) && (iscsi_fd_list[fd].in_flight == 0)) {
uint64_t offset;
@@ -485,7 +485,7 @@ ssize_t write(int fd, const void *buf, size_t count)
iscsi_fd_list[fd].offset += count;
scsi_free_scsi_task(task);
return count;
}
@@ -578,7 +578,7 @@ int __lxstat64(int ver, const char *path, struct stat64 *buf)
ret = __fxstat64(ver, fd, buf);
close(fd);
return ret;
return ret;
}
return real_lxstat64(ver, path, buf);