diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-07-16 21:02:58 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-07-16 22:48:00 +0200 |
| commit | e3ef871d6a80d72db02c9ab1ef492e8f58c2ddeb (patch) | |
| tree | ec28b205b651e83c795e1e264aacfe5bcb307bc4 /tests/tar_ustar.c | |
| parent | bfd876dbf151df164b4d87de20aec39b24f205f9 (diff) | |
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>
Diffstat (limited to 'tests/tar_ustar.c')
| -rw-r--r-- | tests/tar_ustar.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |