From 1c8d703526fa18ed9d6dd6afee82079fd906759f Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 9 Jun 2015 19:35:04 -0500
Subject: [PATCH] file_io.c: get rid of raw_pread() and raw_pwrite()

---
 include/wimlib/file_io.h |  6 ------
 src/file_io.c            | 12 ------------
 src/mount_image.c        |  4 ++--
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/include/wimlib/file_io.h b/include/wimlib/file_io.h
index 34c9d40b..61ae78b9 100644
--- a/include/wimlib/file_io.h
+++ b/include/wimlib/file_io.h
@@ -26,12 +26,6 @@ full_write(struct filedes *fd, const void *buf, size_t n);
 extern int
 full_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset);
 
-extern ssize_t
-raw_pread(struct filedes *fd, void *buf, size_t nbyte, off_t offset);
-
-extern ssize_t
-raw_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset);
-
 #ifndef __WIN32__
 #  define O_BINARY 0
 #endif
diff --git a/src/file_io.c b/src/file_io.c
index f641aa28..26584b9a 100644
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -185,18 +185,6 @@ full_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset)
 	return 0;
 }
 
-ssize_t
-raw_pread(struct filedes *fd, void *buf, size_t count, off_t offset)
-{
-	return pread(fd->fd, buf, count, offset);
-}
-
-ssize_t
-raw_pwrite(struct filedes *fd, const void *buf, size_t count, off_t offset)
-{
-	return pwrite(fd->fd, buf, count, offset);
-}
-
 off_t filedes_seek(struct filedes *fd, off_t offset)
 {
 	if (fd->is_pipe) {
diff --git a/src/mount_image.c b/src/mount_image.c
index e2f0ffbc..aaad08c3 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -1678,7 +1678,7 @@ wimfs_read(const char *path, char *buf, size_t size,
 			ret = size;
 		break;
 	case BLOB_IN_STAGING_FILE:
-		ret = raw_pread(&fd->f_staging_fd, buf, size, offset);
+		ret = pread(fd->f_staging_fd.fd, buf, size, offset);
 		if (ret < 0)
 			ret = -errno;
 		break;
@@ -2034,7 +2034,7 @@ wimfs_write(const char *path, const char *buf, size_t size,
 	struct wimfs_fd *fd = WIMFS_FD(fi);
 	ssize_t ret;
 
-	ret = raw_pwrite(&fd->f_staging_fd, buf, size, offset);
+	ret = pwrite(fd->f_staging_fd.fd, buf, size, offset);
 	if (ret < 0)
 		return -errno;
 
-- 
2.43.0