summaryrefslogtreecommitdiff
path: root/lib/tar/read_header.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-07 14:53:50 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-07 14:56:27 +0200
commit7e1be3986b3b8229f0162431b6e02c24e04a5dba (patch)
treef427b88a1b5edb35232e0aa72fb7d19b4728cbcd /lib/tar/read_header.c
parent267d5318e1cbf69a071b5188dda50310af2f2f8b (diff)
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>
Diffstat (limited to 'lib/tar/read_header.c')
-rw-r--r--lib/tar/read_header.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tar/read_header.c b/lib/tar/read_header.c
index f6d746b..760d36a 100644
--- a/lib/tar/read_header.c
+++ b/lib/tar/read_header.c
@@ -42,7 +42,7 @@ static char *record_to_memory(int fd, sqfs_u64 size)
if (buffer == NULL)
goto fail_errno;
- if (read_data("reading tar record", fd, buffer, size))
+ if (read_retry("reading tar record", fd, buffer, size))
goto fail;
if (skip_padding(fd, size))
@@ -368,7 +368,7 @@ int read_header(int fd, tar_header_decoded_t *out)
memset(out, 0, sizeof(*out));
for (;;) {
- if (read_data("reading tar header", fd, &hdr, sizeof(hdr)))
+ if (read_retry("reading tar header", fd, &hdr, sizeof(hdr)))
goto fail;
if (is_zero_block(&hdr)) {