X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Ffile_io.c;h=317a00d03b61df66d083c93162dcf5ed303256b6;hp=7deaf5e3fcf49463fdbd98a837855f5570e7aaba;hb=ee547cc83f231d727e4d9984c23e86d96d3da769;hpb=e176e9731e696562bab8de7b9bd34c019deef3e8

diff --git a/src/file_io.c b/src/file_io.c
index 7deaf5e3..317a00d0 100644
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -5,38 +5,31 @@
 /*
  * Copyright (C) 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib 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 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib 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
+ * This file 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 Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
-#include "wimlib/error.h"
-#include "wimlib/file_io.h"
-#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>
 #include <unistd.h>
 
+#include "wimlib/error.h"
+#include "wimlib/file_io.h"
+#include "wimlib/util.h"
+#include "wimlib/win32.h" /* For pread(), pwrite() replacements */
 
 /* Wrapper around read() that checks for errors keeps retrying until all
  * requested bytes have been read or until end-of file has occurred.
@@ -206,45 +199,6 @@ full_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset)
 	return 0;
 }
 
-#if 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;
-}
-#endif
-
 ssize_t
 raw_pread(struct filedes *fd, void *buf, size_t count, off_t offset)
 {