From e3ef871d6a80d72db02c9ab1ef492e8f58c2ddeb Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 16 Jul 2019 21:02:58 +0200 Subject: 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 --- tests/tar_xattr_bsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/tar_xattr_bsd.c') 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); -- cgit v1.2.3