diff options
Diffstat (limited to 'lib/io/src')
| -rw-r--r-- | lib/io/src/get_line.c | 2 | ||||
| -rw-r--r-- | lib/io/src/istream.c | 6 | ||||
| -rw-r--r-- | lib/io/src/xfrm/istream.c | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/lib/io/src/get_line.c b/lib/io/src/get_line.c index a939a6c..94ae9ce 100644 --- a/lib/io/src/get_line.c +++ b/lib/io/src/get_line.c @@ -50,7 +50,7 @@ int istream_get_line(istream_t *strm, char **out, const sqfs_u8 *ptr; int ret; - ret = istream_get_buffered_data(strm, &ptr, &avail); + ret = istream_get_buffered_data(strm, &ptr, &avail, 0); if (ret < 0) goto fail_free; if (ret > 0) { diff --git a/lib/io/src/istream.c b/lib/io/src/istream.c index 6171f2c..b4c709c 100644 --- a/lib/io/src/istream.c +++ b/lib/io/src/istream.c @@ -19,7 +19,7 @@ sqfs_s32 istream_read(istream_t *strm, void *data, size_t size) size_t diff; int ret; - ret = istream_get_buffered_data(strm, &ptr, &diff); + ret = istream_get_buffered_data(strm, &ptr, &diff, size); if (ret > 0) break; if (ret < 0) @@ -48,7 +48,7 @@ int istream_skip(istream_t *strm, sqfs_u64 size) size_t diff; int ret; - ret = istream_get_buffered_data(strm, &ptr, &diff); + ret = istream_get_buffered_data(strm, &ptr, &diff, size); if (ret < 0) return ret; if (ret > 0) { @@ -81,7 +81,7 @@ sqfs_s32 istream_splice(istream_t *in, ostream_t *out, sqfs_u32 size) size_t diff; int ret; - ret = istream_get_buffered_data(in, &ptr, &diff); + ret = istream_get_buffered_data(in, &ptr, &diff, size); if (ret < 0) return ret; if (ret > 0) diff --git a/lib/io/src/xfrm/istream.c b/lib/io/src/xfrm/istream.c index 2ada5db..8755cb6 100644 --- a/lib/io/src/xfrm/istream.c +++ b/lib/io/src/xfrm/istream.c @@ -37,11 +37,8 @@ static int xfrm_precache(istream_t *base) const sqfs_u8 *ptr; size_t avail; - ret = istream_precache(xfrm->wrapped); - if (ret != 0) - return ret; - - ret = istream_get_buffered_data(xfrm->wrapped, &ptr, &avail); + ret = istream_get_buffered_data(xfrm->wrapped, &ptr, &avail, + sizeof(xfrm->uncompressed)); if (ret < 0) return ret; if (ret > 0) { |