From 4d46b361ff1371a6f3f4f89ed8ca81ee23e86de8 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 6 Nov 2019 11:54:56 +0100 Subject: Remove raw file descriptors from tar read path Signed-off-by: David Oberhollenzer --- lib/tar/skip.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/tar/skip.c') diff --git a/lib/tar/skip.c b/lib/tar/skip.c index e5c9772..94e4a96 100644 --- a/lib/tar/skip.c +++ b/lib/tar/skip.c @@ -11,7 +11,7 @@ #include -static int skip_bytes(int fd, sqfs_u64 size) +static int skip_bytes(FILE *fp, sqfs_u64 size) { unsigned char buffer[1024]; size_t diff; @@ -21,7 +21,7 @@ static int skip_bytes(int fd, sqfs_u64 size) if (diff > size) diff = size; - if (read_retry("reading tar record padding", fd, buffer, diff)) + if (read_retry("reading tar record padding", fp, buffer, diff)) return -1; size -= diff; @@ -30,16 +30,16 @@ static int skip_bytes(int fd, sqfs_u64 size) return 0; } -int skip_padding(int fd, sqfs_u64 size) +int skip_padding(FILE *fp, sqfs_u64 size) { size_t tail = size % 512; - return tail ? skip_bytes(fd, 512 - tail) : 0; + return tail ? skip_bytes(fp, 512 - tail) : 0; } -int skip_entry(int fd, sqfs_u64 size) +int skip_entry(FILE *fp, sqfs_u64 size) { size_t tail = size % 512; - return skip_bytes(fd, tail ? (size + 512 - tail) : size); + return skip_bytes(fp, tail ? (size + 512 - tail) : size); } -- cgit v1.2.3