summaryrefslogtreecommitdiff
path: root/lib/util/read_retry.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-07-16 21:02:58 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-07-16 22:48:00 +0200
commite3ef871d6a80d72db02c9ab1ef492e8f58c2ddeb (patch)
treeec28b205b651e83c795e1e264aacfe5bcb307bc4 /lib/util/read_retry.c
parentbfd876dbf151df164b4d87de20aec39b24f205f9 (diff)
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>
Diffstat (limited to 'lib/util/read_retry.c')
-rw-r--r--lib/util/read_retry.c27
1 files changed, 0 insertions, 27 deletions
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 <unistd.h>
-#include <errno.h>
-
-#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;
-}