From 63bc750fecb00fc5878ca889204fc65510893778 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Sun, 11 Jun 2023 23:27:16 +0200
Subject: libio: remove single line wrapper functions

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 lib/io/src/get_line.c     |  4 ++--
 lib/io/src/istream.c      | 14 +++++++-------
 lib/io/src/xfrm/istream.c |  6 +++---
 lib/io/src/xfrm/ostream.c |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'lib/io/src')

diff --git a/lib/io/src/get_line.c b/lib/io/src/get_line.c
index 4dc221a..7ebce0e 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, 0);
+		ret = strm->get_buffered_data(strm, &ptr, &avail, 0);
 		if (ret < 0)
 			goto fail_free;
 		if (ret > 0) {
@@ -85,7 +85,7 @@ int istream_get_line(istream_t *strm, char **out,
 		line_len += count;
 		line[line_len] = '\0';
 
-		istream_advance_buffer(strm, i);
+		strm->advance_buffer(strm, i);
 
 		if (have_line) {
 			if (line_len > 0 && line[line_len - 1] == '\r')
diff --git a/lib/io/src/istream.c b/lib/io/src/istream.c
index 9340dd6..473f1af 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, size);
+		ret = strm->get_buffered_data(strm, &ptr, &diff, size);
 		if (ret > 0)
 			break;
 		if (ret < 0)
@@ -29,7 +29,7 @@ sqfs_s32 istream_read(istream_t *strm, void *data, size_t size)
 			diff = size;
 
 		memcpy(data, ptr, diff);
-		istream_advance_buffer(strm, diff);
+		strm->advance_buffer(strm, diff);
 		data = (char *)data + diff;
 		size -= diff;
 		total += diff;
@@ -45,7 +45,7 @@ int istream_skip(istream_t *strm, sqfs_u64 size)
 		size_t diff;
 		int ret;
 
-		ret = istream_get_buffered_data(strm, &ptr, &diff, size);
+		ret = strm->get_buffered_data(strm, &ptr, &diff, size);
 		if (ret < 0)
 			return ret;
 		if (ret > 0) {
@@ -58,7 +58,7 @@ int istream_skip(istream_t *strm, sqfs_u64 size)
 			diff = size;
 
 		size -= diff;
-		istream_advance_buffer(strm, diff);
+		strm->advance_buffer(strm, diff);
 	}
 
 	return 0;
@@ -76,7 +76,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, size);
+		ret = in->get_buffered_data(in, &ptr, &diff, size);
 		if (ret < 0)
 			return ret;
 		if (ret > 0)
@@ -85,12 +85,12 @@ sqfs_s32 istream_splice(istream_t *in, ostream_t *out, sqfs_u32 size)
 		if (diff > size)
 			diff = size;
 
-		if (ostream_append(out, ptr, diff))
+		if (out->append(out, ptr, diff))
 			return -1;
 
 		total += diff;
 		size -= diff;
-		istream_advance_buffer(in, diff);
+		in->advance_buffer(in, diff);
 	}
 
 	return total;
diff --git a/lib/io/src/xfrm/istream.c b/lib/io/src/xfrm/istream.c
index c9bc41a..632409c 100644
--- a/lib/io/src/xfrm/istream.c
+++ b/lib/io/src/xfrm/istream.c
@@ -38,8 +38,8 @@ static int precache(istream_t *base)
 		const sqfs_u8 *ptr;
 		size_t avail;
 
-		ret = istream_get_buffered_data(xfrm->wrapped, &ptr, &avail,
-						sizeof(xfrm->uncompressed));
+		ret = xfrm->wrapped->get_buffered_data(xfrm->wrapped, &ptr,
+						       &avail, BUFSZ);
 		if (ret < 0)
 			return ret;
 		if (ret > 0)
@@ -58,7 +58,7 @@ static int precache(istream_t *base)
 		}
 
 		xfrm->buffer_used = out_off;
-		istream_advance_buffer(xfrm->wrapped, in_off);
+		xfrm->wrapped->advance_buffer(xfrm->wrapped, in_off);
 
 		if (ret == XFRM_STREAM_BUFFER_FULL || out_off >= BUFSZ)
 			break;
diff --git a/lib/io/src/xfrm/ostream.c b/lib/io/src/xfrm/ostream.c
index bd94515..79ed49a 100644
--- a/lib/io/src/xfrm/ostream.c
+++ b/lib/io/src/xfrm/ostream.c
@@ -42,7 +42,7 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish)
 			return -1;
 		}
 
-		if (ostream_append(xfrm->wrapped, xfrm->outbuf, off_out))
+		if (xfrm->wrapped->append(xfrm->wrapped, xfrm->outbuf, off_out))
 			return -1;
 
 		off_out = 0;
@@ -52,7 +52,7 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish)
 	}
 
 	if (off_out > 0) {
-		if (ostream_append(xfrm->wrapped, xfrm->outbuf, off_out))
+		if (xfrm->wrapped->append(xfrm->wrapped, xfrm->outbuf, off_out))
 			return -1;
 	}
 
-- 
cgit v1.2.3