util: Use myread() in read_file()

Now that we check the file size before reading, we no longer expect
to hit the end of file prematurely. This means we can call myread()
instead of reimplementing it, thus removing some code redundancy.

Signed-off-by: Jean Delvare <jdelvare@suse.de>

1 files changed, 5 insertions, 20 deletions

diff --git a/util.c b/util.c
index 1b95e87..276edfe 100644
--- a/util.c
+++ b/util.c
@@ -99,8 +99,6 @@ void *read_file(off_t base, size_t *max_len, const char *filename)
 {
 	struct stat statbuf;
 	int fd;
-	size_t r2 = 0;
-	ssize_t r;
 	u8 *p;
 
 	/*
@@ -137,25 +135,12 @@ void *read_file(off_t base, size_t *max_len, const char *filename)
 		goto out;
 	}
 
-	do
-	{
-		r = read(fd, p + r2, *max_len - r2);
-		if (r == -1)
-		{
-			if (errno != EINTR)
-			{
-				perror(filename);
-				free(p);
-				p = NULL;
-				goto out;
-			}
-		}
-		else
-			r2 += r;
-	}
-	while (r != 0);
+	if (myread(fd, p, *max_len, filename) == 0)
+		goto out;
+
+	free(p);
+	p = NULL;
 
-	*max_len = r2;
 out:
 	close(fd);