From 63bc750fecb00fc5878ca889204fc65510893778 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 11 Jun 2023 23:27:16 +0200 Subject: libio: remove single line wrapper functions Signed-off-by: David Oberhollenzer --- lib/tar/src/iterator.c | 11 ++++++----- lib/tar/src/write_header.c | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'lib/tar/src') diff --git a/lib/tar/src/iterator.c b/lib/tar/src/iterator.c index 5d44c28..1f26e76 100644 --- a/lib/tar/src/iterator.c +++ b/lib/tar/src/iterator.c @@ -118,8 +118,9 @@ static int strm_get_buffered_data(istream_t *strm, const sqfs_u8 **out, *size = (diff <= sizeof(tar->buffer)) ? diff : sizeof(tar->buffer); } else { - ret = istream_get_buffered_data(tar->parent->stream, - out, size, diff); + ret = tar->parent->stream-> + get_buffered_data(tar->parent->stream, + out, size, diff); if (ret > 0) goto fail_borked; if (ret < 0) @@ -146,7 +147,7 @@ static void strm_advance_buffer(istream_t *strm, size_t count) tar_istream_t *tar = (tar_istream_t *)strm; if (!tar->parent->last_sparse) { - istream_advance_buffer(tar->parent->stream, count); + tar->parent->stream->advance_buffer(tar->parent->stream, count); tar->parent->record_size -= count; } @@ -371,8 +372,8 @@ dir_iterator_t *tar_open_stream(istream_t *strm) it->read_xattr = it_read_xattr; /* proble if the stream is compressed */ - ret = istream_get_buffered_data(strm, &ptr, &size, - sizeof(tar_header_t)); + ret = strm->get_buffered_data(strm, &ptr, &size, + sizeof(tar_header_t)); if (ret != 0) goto out_strm; diff --git a/lib/tar/src/write_header.c b/lib/tar/src/write_header.c index 039d1fe..726b15d 100644 --- a/lib/tar/src/write_header.c +++ b/lib/tar/src/write_header.c @@ -98,7 +98,7 @@ static int write_header(ostream_t *fp, const struct stat *sb, const char *name, update_checksum(&hdr); - return ostream_append(fp, &hdr, sizeof(hdr)); + return fp->append(fp, &hdr, sizeof(hdr)); } static int write_ext_header(ostream_t *fp, const struct stat *orig, @@ -114,7 +114,7 @@ static int write_ext_header(ostream_t *fp, const struct stat *orig, if (write_header(fp, &sb, name, NULL, type)) return -1; - if (ostream_append(fp, payload, payload_len)) + if (fp->append(fp, payload, payload_len)) return -1; return padd_file(fp, payload_len); @@ -288,5 +288,5 @@ int write_hard_link(ostream_t *fp, const struct stat *sb, const char *name, write_number(hdr.devminor, 0, sizeof(hdr.devminor)); update_checksum(&hdr); - return ostream_append(fp, &hdr, sizeof(hdr)); + return fp->append(fp, &hdr, sizeof(hdr)); } -- cgit v1.2.3