X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Ffile_io.c;h=752c1121e8ee5f388452cc8bb9cfc8c927ef9c65;hb=d20508c65ee45d265f48964ba312f10f8c67a9c8;hp=94f1ced53d5db62e6ceb2aeded40713f62b73674;hpb=fad8b28269c0b29f617c7e6cd9e00cd92df46a21;p=wimlib

diff --git a/src/file_io.c b/src/file_io.c
index 94f1ced5..752c1121 100644
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -30,8 +30,6 @@
 #include "wimlib/util.h"
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* For pread(), pwrite() replacements */
-#else
-#  include <sys/uio.h> /* for writev() and `struct iovec' */
 #endif
 
 #include <errno.h>
@@ -126,7 +124,7 @@ full_pread(struct filedes *fd, void *buf, size_t count, off_t offset)
 	for (bytes_remaining = count;
 	     bytes_remaining != 0;
 	     bytes_remaining -= bytes_read, buf += bytes_read,
-	     	offset += bytes_read)
+		offset += bytes_read)
 	{
 		bytes_read = pread(fd->fd, buf, bytes_remaining, offset);
 		if (unlikely(bytes_read <= 0)) {
@@ -194,7 +192,7 @@ full_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset)
 	for (bytes_remaining = count;
 	     bytes_remaining != 0;
 	     bytes_remaining -= bytes_written, buf += bytes_written,
-	     	offset += bytes_written)
+		offset += bytes_written)
 	{
 		bytes_written = pwrite(fd->fd, buf, bytes_remaining, offset);
 		if (unlikely(bytes_written < 0)) {
@@ -206,43 +204,6 @@ full_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset)
 	return 0;
 }
 
-/* Wrapper around writev() that checks for errors and keep retrying until all
- * requested bytes have been written.
- *
- * Return values:
- *	WIMLIB_ERR_SUCCESS	(0)
- *	WIMLIB_ERR_WRITE	(errno set)
- * */
-int
-full_writev(struct filedes *fd, struct iovec *iov, int iovcnt)
-{
-	size_t total_bytes_written = 0;
-	while (iovcnt > 0) {
-		ssize_t bytes_written;
-
-		bytes_written = writev(fd->fd, iov, iovcnt);
-		if (unlikely(bytes_written < 0)) {
-			if (errno == EINTR)
-				continue;
-			return WIMLIB_ERR_WRITE;
-		}
-		total_bytes_written += bytes_written;
-		while (bytes_written) {
-			if (bytes_written >= iov[0].iov_len) {
-				bytes_written -= iov[0].iov_len;
-				iov++;
-				iovcnt--;
-			} else {
-				iov[0].iov_base += bytes_written;
-				iov[0].iov_len -= bytes_written;
-				bytes_written = 0;
-			}
-		}
-	}
-	fd->offset += total_bytes_written;
-	return 0;
-}
-
 ssize_t
 raw_pread(struct filedes *fd, void *buf, size_t count, off_t offset)
 {