X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Ffile_io.c;h=752c1121e8ee5f388452cc8bb9cfc8c927ef9c65;hb=2915014b741493083571954e10c8add9dc09a522;hp=7deaf5e3fcf49463fdbd98a837855f5570e7aaba;hpb=e176e9731e696562bab8de7b9bd34c019deef3e8;p=wimlib diff --git a/src/file_io.c b/src/file_io.c index 7deaf5e3..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 /* for writev() and `struct iovec' */ #endif #include @@ -206,45 +204,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) {