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>

5 files changed, 19 insertions, 19 deletions

diff --git a/tests/tar_gnu.c b/tests/tar_gnu.c
index 5ce150f..74e376b 100644
--- a/tests/tar_gnu.c
+++ b/tests/tar_gnu.c
@@ -50,7 +50,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -67,7 +67,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 013375561750);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data1", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -98,7 +98,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 013376036700);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data2", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -115,7 +115,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 8589934592);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data3", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -132,7 +132,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == -315622800);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data4", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -149,7 +149,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542909670);
 	assert(strcmp(hdr.name, filename) == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data5", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
diff --git a/tests/tar_pax.c b/tests/tar_pax.c
index 6ecc361..800e9f1 100644
--- a/tests/tar_pax.c
+++ b/tests/tar_pax.c
@@ -50,7 +50,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -81,7 +81,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542999260);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data1", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -98,7 +98,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1543015033);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data2", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -115,7 +115,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1543015908);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data3", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -132,7 +132,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542909670);
 	assert(strcmp(hdr.name, filename) == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data4", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
diff --git a/tests/tar_ustar.c b/tests/tar_ustar.c
index acd7097..0395642 100644
--- a/tests/tar_ustar.c
+++ b/tests/tar_ustar.c
@@ -50,7 +50,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -67,7 +67,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data1", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -84,7 +84,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data2", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -115,7 +115,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 013376036700);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data3", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -132,7 +132,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 8589934592);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data4", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -149,7 +149,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1542909670);
 	assert(strcmp(hdr.name, filename) == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data5", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
diff --git a/tests/tar_xattr_bsd.c b/tests/tar_xattr_bsd.c
index cfd7ad7..e324b4c 100644
--- a/tests/tar_xattr_bsd.c
+++ b/tests/tar_xattr_bsd.c
@@ -45,7 +45,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1543094606);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 
diff --git a/tests/tar_xattr_schily.c b/tests/tar_xattr_schily.c
index 481e6ea..4dca88e 100644
--- a/tests/tar_xattr_schily.c
+++ b/tests/tar_xattr_schily.c
@@ -45,7 +45,7 @@ int main(void)
 	assert(hdr.sb.st_ctime == 1543094606);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_retry(fd, buffer, 5) == 5);
+	assert(read_data("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);