From 1370963723917eed6c93e28c9970a2b27be57ea4 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 4 Jun 2023 20:26:14 +0200 Subject: libio: remove buffer_offset from istream_t Instead, make the buffer const, let the user adjust the pointer and size. The offset can then be inferred in precache. Signed-off-by: David Oberhollenzer --- bin/tar2sqfs/src/tar2sqfs.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'bin/tar2sqfs/src') diff --git a/bin/tar2sqfs/src/tar2sqfs.c b/bin/tar2sqfs/src/tar2sqfs.c index 9257fed..1145675 100644 --- a/bin/tar2sqfs/src/tar2sqfs.c +++ b/bin/tar2sqfs/src/tar2sqfs.c @@ -36,22 +36,17 @@ static istream_t *magic_autowrap(istream_t *strm) { xfrm_stream_t *xfrm = NULL; istream_t *wrapper = NULL; - const sqfs_u8 *data; - size_t avail; int ret; ret = istream_precache(strm); if (ret != 0) goto out; - data = strm->buffer + strm->buffer_offset; - avail = strm->buffer_used - strm->buffer_offset; - - ret = tar_probe(data, avail); + ret = tar_probe(strm->buffer, strm->buffer_used); if (ret > 0) return strm; - ret = xfrm_compressor_id_from_magic(data, avail); + ret = xfrm_compressor_id_from_magic(strm->buffer, strm->buffer_used); if (ret <= 0) return strm; -- cgit v1.2.3