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 --- lib/util/read_data.c | 30 ++++++++++++++++++++++++++++++ lib/util/read_retry.c | 27 --------------------------- 2 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 lib/util/read_data.c delete mode 100644 lib/util/read_retry.c (limited to 'lib/util') diff --git a/lib/util/read_data.c b/lib/util/read_data.c new file mode 100644 index 0000000..43f8da8 --- /dev/null +++ b/lib/util/read_data.c @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +#include +#include +#include + +#include "util.h" + +int read_data(const char *errstr, int fd, void *buffer, size_t size) +{ + ssize_t ret; + + while (size > 0) { + ret = read(fd, buffer, size); + if (ret < 0) { + if (errno == EINTR) + continue; + perror(errstr); + return -1; + } + if (ret == 0) { + fprintf(stderr, "%s: short read\n", errstr); + return -1; + } + + size -= ret; + buffer = (char *)buffer + ret; + } + + return 0; +} diff --git a/lib/util/read_retry.c b/lib/util/read_retry.c deleted file mode 100644 index eb113c4..0000000 --- a/lib/util/read_retry.c +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -#include -#include - -#include "util.h" - -ssize_t read_retry(int fd, void *buffer, size_t size) -{ - ssize_t ret, total = 0; - - while (size > 0) { - ret = read(fd, buffer, size); - if (ret < 0) { - if (errno == EINTR) - continue; - return -1; - } - if (ret == 0) - break; - - total += ret; - size -= ret; - buffer = (char *)buffer + ret; - } - - return total; -} -- cgit v1.2.3