From ad1691aa33cfc1b1558ce10e93552d0eb1cdcd63 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 10 Jun 2023 17:51:03 +0200 Subject: libio: add desired read size to istream_get_buffered_data This properly maps to all of our use cases and makes istream_precache obsolete. Signed-off-by: David Oberhollenzer --- lib/tar/src/iterator.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib/tar') diff --git a/lib/tar/src/iterator.c b/lib/tar/src/iterator.c index 66b5dfc..f46a9c2 100644 --- a/lib/tar/src/iterator.c +++ b/lib/tar/src/iterator.c @@ -132,7 +132,7 @@ static int strm_precache(istream_t *strm) int ret; ret = istream_get_buffered_data(tar->parent->stream, - &strm->buffer, &avail); + &strm->buffer, &avail, diff); if (ret > 0) goto fail_borked; if (ret < 0) @@ -373,11 +373,8 @@ dir_iterator_t *tar_open_stream(istream_t *strm) it->read_xattr = it_read_xattr; /* proble if the stream is compressed */ - ret = istream_precache(strm); - if (ret != 0) - goto out_strm; - - ret = istream_get_buffered_data(strm, &ptr, &size); + ret = istream_get_buffered_data(strm, &ptr, &size, + sizeof(tar_header_t)); if (ret != 0) goto out_strm; -- cgit v1.2.3