Cleanup: move read_data function to libtar

Its the only user. The other code doesn't touch raw file
descriptors anymore.

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 4bff6ff..5aa112c 100644
--- a/tests/tar_gnu.c
+++ b/tests/tar_gnu.c
@@ -56,7 +56,7 @@ int main(void)
 	assert(hdr.mtime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data0", fd, buffer, 5) == 0);
+	assert(read_retry("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -72,7 +72,7 @@ int main(void)
 	assert(hdr.mtime == 013375560044);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data1", fd, buffer, 5) == 0);
+	assert(read_retry("data1", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -101,7 +101,7 @@ int main(void)
 	assert(hdr.mtime == 013376036700);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data2", fd, buffer, 5) == 0);
+	assert(read_retry("data2", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -121,7 +121,7 @@ int main(void)
 	assert(hdr.mtime == 8589934592L);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data3", fd, buffer, 5) == 0);
+	assert(read_retry("data3", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -137,7 +137,7 @@ int main(void)
 	assert(hdr.mtime == -315622800);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data4", fd, buffer, 5) == 0);
+	assert(read_retry("data4", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -153,7 +153,7 @@ int main(void)
 	assert(hdr.mtime == 1542909670);
 	assert(strcmp(hdr.name, filename) == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data5", fd, buffer, 5) == 0);
+	assert(read_retry("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 866e6eb..79301b6 100644
--- a/tests/tar_pax.c
+++ b/tests/tar_pax.c
@@ -56,7 +56,7 @@ int main(void)
 	assert(hdr.mtime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data0", fd, buffer, 5) == 0);
+	assert(read_retry("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -85,7 +85,7 @@ int main(void)
 	assert(hdr.mtime == 013376036700);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data1", fd, buffer, 5) == 0);
+	assert(read_retry("data1", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -105,7 +105,7 @@ int main(void)
 	assert(hdr.mtime == 8589934592L);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data2", fd, buffer, 5) == 0);
+	assert(read_retry("data2", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -121,7 +121,7 @@ int main(void)
 	assert(hdr.mtime == -315622800);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data3", fd, buffer, 5) == 0);
+	assert(read_retry("data3", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -137,7 +137,7 @@ int main(void)
 	assert(hdr.mtime == 1542909670);
 	assert(strcmp(hdr.name, filename) == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data4", fd, buffer, 5) == 0);
+	assert(read_retry("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 2a59ac3..1a03784 100644
--- a/tests/tar_ustar.c
+++ b/tests/tar_ustar.c
@@ -56,7 +56,7 @@ int main(void)
 	assert(hdr.mtime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data0", fd, buffer, 5) == 0);
+	assert(read_retry("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -72,7 +72,7 @@ int main(void)
 	assert(hdr.mtime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data1", fd, buffer, 5) == 0);
+	assert(read_retry("data1", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -88,7 +88,7 @@ int main(void)
 	assert(hdr.mtime == 1542905892);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data2", fd, buffer, 5) == 0);
+	assert(read_retry("data2", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -117,7 +117,7 @@ int main(void)
 	assert(hdr.mtime == 013376036700);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data3", fd, buffer, 5) == 0);
+	assert(read_retry("data3", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -137,7 +137,7 @@ int main(void)
 	assert(hdr.mtime == 8589934592L);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data4", fd, buffer, 5) == 0);
+	assert(read_retry("data4", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);
 	clear_header(&hdr);
@@ -153,7 +153,7 @@ int main(void)
 	assert(hdr.mtime == 1542909670);
 	assert(strcmp(hdr.name, filename) == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data5", fd, buffer, 5) == 0);
+	assert(read_retry("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 2e9479c..50c0150 100644
--- a/tests/tar_xattr_bsd.c
+++ b/tests/tar_xattr_bsd.c
@@ -51,7 +51,7 @@ int main(void)
 	assert(hdr.mtime == 1543094477);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data0", fd, buffer, 5) == 0);
+	assert(read_retry("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 5f09110..033941a 100644
--- a/tests/tar_xattr_schily.c
+++ b/tests/tar_xattr_schily.c
@@ -51,7 +51,7 @@ int main(void)
 	assert(hdr.mtime == 1543094477);
 	assert(strcmp(hdr.name, "input.txt") == 0);
 	assert(!hdr.unknown_record);
-	assert(read_data("data0", fd, buffer, 5) == 0);
+	assert(read_retry("data0", fd, buffer, 5) == 0);
 	buffer[5] = '\0';
 	assert(strcmp(buffer, "test\n") == 0);