From e3ef871d6a80d72db02c9ab1ef492e8f58c2ddeb Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 16 Jul 2019 21:02:58 +0200 Subject: 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 --- include/util.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/util.h b/include/util.h index aff313f..1503fb8 100644 --- a/include/util.h +++ b/include/util.h @@ -31,9 +31,11 @@ int write_data(const char *errstr, int fd, const void *data, size_t size); /* A wrapper around the read() system call. It retries the read if it is - interrupted by a signal or less than the desired size was read. + interrupted by a signal or less than the desired size was read. Returns 0 + on success. Writes to stderr on failure using 'errstr' as a perror style + error prefix. */ -ssize_t read_retry(int fd, void *buffer, size_t size); +int read_data(const char *errstr, int fd, void *buffer, size_t size); /* A common implementation of the '--version' command line flag. -- cgit v1.2.3