write.c: Don't default to solid mode quite as easily

[wimlib] / src / file_io.c

diff --git a/src/file_io.c b/src/file_io.c
index 94f1ced53d5db62e6ceb2aeded40713f62b73674..014db8cfdebb6e6aaedb9c511b4a3d41ee8cd7dd 100644 (file)
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -126,7 +126,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 +194,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 +206,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)
 {