cleanup: move error handling into read_retry

If read_retry fails to read the expected amount of data (EOF or otherwise),
it is almost always an error.

This commit renames read_retry to read_data and moves error handling
into the function, making a lot of error handling code redundant.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 2 insertions, 11 deletions

diff --git a/lib/comp/compressor.c b/lib/comp/compressor.c
index 96bc3b1..b92462e 100644
--- a/lib/comp/compressor.c
+++ b/lib/comp/compressor.c
@@ -74,18 +74,9 @@ int generic_write_options(int fd, const void *data, size_t size)
 int generic_read_options(int fd, void *data, size_t size)
 {
 	uint8_t buffer[size + 2];
-	ssize_t ret;
 
-	ret = read_retry(fd, buffer, sizeof(buffer));
-
-	if (ret < 0) {
-		perror("reading compressor options");
-		return -1;
-	}
-
-	if ((size_t)ret < sizeof(buffer)) {
-		fputs("reading compressor options: unexpected end of file\n",
-		      stderr);
+	if (read_data("reading compressor options",
+		      fd, buffer, sizeof(buffer))) {
 		return -1;
 	}