From bfd876dbf151df164b4d87de20aec39b24f205f9 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
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 <david.oberhollenzer@sigma-star.at>
---
 lib/util/padd_file.c   | 15 ++++-----------
 lib/util/write_data.c  | 30 ++++++++++++++++++++++++++++++
 lib/util/write_retry.c | 27 ---------------------------
 3 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 lib/util/write_data.c
 delete mode 100644 lib/util/write_retry.c

(limited to 'lib/util')

diff --git a/lib/util/padd_file.c b/lib/util/padd_file.c
index 8598b8b..2f1ea9a 100644
--- a/lib/util/padd_file.c
+++ b/lib/util/padd_file.c
@@ -9,7 +9,6 @@ int padd_file(int outfd, uint64_t size, size_t blocksize)
 	size_t padd_sz = size % blocksize;
 	int status = -1;
 	uint8_t *buffer;
-	ssize_t ret;
 
 	if (padd_sz == 0)
 		return 0;
@@ -20,21 +19,15 @@ int padd_file(int outfd, uint64_t size, size_t blocksize)
 	if (buffer == NULL)
 		goto fail_errno;
 
-	ret = write_retry(outfd, buffer, padd_sz);
-
-	if (ret < 0)
-		goto fail_errno;
-
-	if ((size_t)ret < padd_sz)
-		goto fail_trunc;
+	if (write_data("padding output file to block size",
+		       outfd, buffer, padd_sz)) {
+		goto out;
+	}
 
 	status = 0;
 out:
 	free(buffer);
 	return status;
-fail_trunc:
-	fputs("padding output to block size: truncated write\n", stderr);
-	goto out;
 fail_errno:
 	perror("padding output file to block size");
 	goto out;
diff --git a/lib/util/write_data.c b/lib/util/write_data.c
new file mode 100644
index 0000000..82f3aca
--- /dev/null
+++ b/lib/util/write_data.c
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "util.h"
+
+int write_data(const char *errstr, int fd, const void *data, size_t size)
+{
+	ssize_t ret;
+
+	while (size > 0) {
+		ret = write(fd, data, size);
+		if (ret == 0) {
+			fprintf(stderr, "%s: write truncated\n", errstr);
+			return -1;
+		}
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			perror(errstr);
+			return -1;
+		}
+
+		data = (const char *)data + ret;
+		size -= ret;
+	}
+
+	return 0;
+}
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 <unistd.h>
-#include <errno.h>
-
-#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