From bfd876dbf151df164b4d87de20aec39b24f205f9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 16 Jul 2019 19:29:27 +0200 Subject: cleanup: move error handling into write_retry If write_retry fails to write everything, it is *always* an error. This commit renames write_retry to write_data and moves error handling into the function, making a lot of error handling code redundant. Signed-off-by: David Oberhollenzer --- lib/util/write_retry.c | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 lib/util/write_retry.c (limited to 'lib/util/write_retry.c') diff --git a/lib/util/write_retry.c b/lib/util/write_retry.c deleted file mode 100644 index 0ef856c..0000000 --- a/lib/util/write_retry.c +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -#include -#include - -#include "util.h" - -ssize_t write_retry(int fd, const void *data, size_t size) -{ - ssize_t ret, total = 0; - - while (size > 0) { - ret = write(fd, data, size); - if (ret == 0) - break; - if (ret < 0) { - if (errno == EINTR) - continue; - return -1; - } - - data = (const char *)data + ret; - size -= ret; - total += ret; - } - - return total; -} -- cgit v1.2.3