Mass rename istream_t/ostream_t with sqfs_ prefix

istream_t becomes sqfs_istream_t and ostream_t becomes sqfs_ostream_t

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

12 files changed, 67 insertions, 67 deletions

diff --git a/lib/io/src/dir_tree_iterator.c b/lib/io/src/dir_tree_iterator.c
index 25cb1d9..4303817 100644
--- a/lib/io/src/dir_tree_iterator.c
+++ b/lib/io/src/dir_tree_iterator.c
@@ -272,7 +272,7 @@ static void ignore_subdir(dir_iterator_t *base)
 	pop(it);
 }
 
-static int open_file_ro(dir_iterator_t *base, istream_t **out)
+static int open_file_ro(dir_iterator_t *base, sqfs_istream_t **out)
 {
 	dir_tree_iterator_t *it = (dir_tree_iterator_t *)base;
 
diff --git a/lib/io/src/get_line.c b/lib/io/src/get_line.c
index 7ebce0e..9ab4928 100644
--- a/lib/io/src/get_line.c
+++ b/lib/io/src/get_line.c
@@ -38,7 +38,7 @@ static size_t trim(char *buffer, int flags)
 	return strlen(buffer);
 }
 
-int istream_get_line(istream_t *strm, char **out,
+int istream_get_line(sqfs_istream_t *strm, char **out,
 		     size_t *line_num, int flags)
 {
 	char *line = NULL, *new;
diff --git a/lib/io/src/istream.c b/lib/io/src/istream.c
index 473f1af..6fbc67b 100644
--- a/lib/io/src/istream.c
+++ b/lib/io/src/istream.c
@@ -7,7 +7,7 @@
 #include "internal.h"
 
 
-sqfs_s32 istream_read(istream_t *strm, void *data, size_t size)
+sqfs_s32 istream_read(sqfs_istream_t *strm, void *data, size_t size)
 {
 	sqfs_s32 total = 0;
 
@@ -38,7 +38,7 @@ sqfs_s32 istream_read(istream_t *strm, void *data, size_t size)
 	return total;
 }
 
-int istream_skip(istream_t *strm, sqfs_u64 size)
+int istream_skip(sqfs_istream_t *strm, sqfs_u64 size)
 {
 	while (size > 0) {
 		const sqfs_u8 *ptr;
@@ -64,7 +64,7 @@ int istream_skip(istream_t *strm, sqfs_u64 size)
 	return 0;
 }
 
-sqfs_s32 istream_splice(istream_t *in, ostream_t *out, sqfs_u32 size)
+sqfs_s32 istream_splice(sqfs_istream_t *in, sqfs_ostream_t *out, sqfs_u32 size)
 {
 	sqfs_s32 total = 0;
 
diff --git a/lib/io/src/mem.c b/lib/io/src/mem.c
index bbb186a..435a169 100644
--- a/lib/io/src/mem.c
+++ b/lib/io/src/mem.c
@@ -13,7 +13,7 @@
 #include <assert.h>
 
 typedef struct {
-	istream_t base;
+	sqfs_istream_t base;
 
 	sqfs_u8 *buffer;
 	size_t bufsz;
@@ -26,7 +26,7 @@ typedef struct {
 	char *name;
 } mem_istream_t;
 
-static int mem_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
+static int mem_get_buffered_data(sqfs_istream_t *strm, const sqfs_u8 **out,
 				 size_t *size, size_t want)
 {
 	mem_istream_t *mem = (mem_istream_t *)strm;
@@ -50,7 +50,7 @@ static int mem_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
 	return (mem->visible == 0) ? 1 : 0;
 }
 
-static void mem_advance_buffer(istream_t *strm, size_t count)
+static void mem_advance_buffer(sqfs_istream_t *strm, size_t count)
 {
 	mem_istream_t *mem = (mem_istream_t *)strm;
 
@@ -68,7 +68,7 @@ static void mem_advance_buffer(istream_t *strm, size_t count)
 	}
 }
 
-static const char *mem_in_get_filename(istream_t *strm)
+static const char *mem_in_get_filename(sqfs_istream_t *strm)
 {
 	return ((mem_istream_t *)strm)->name;
 }
@@ -80,11 +80,11 @@ static void mem_in_destroy(sqfs_object_t *obj)
 	free(obj);
 }
 
-istream_t *istream_memory_create(const char *name, size_t bufsz,
-				 const void *data, size_t size)
+sqfs_istream_t *istream_memory_create(const char *name, size_t bufsz,
+				      const void *data, size_t size)
 {
 	mem_istream_t *mem = calloc(1, sizeof(*mem));
-	istream_t *strm = (istream_t *)mem;
+	sqfs_istream_t *strm = (sqfs_istream_t *)mem;
 
 	if (mem == NULL)
 		return NULL;
diff --git a/lib/io/src/unix/dir_iterator.c b/lib/io/src/unix/dir_iterator.c
index 9ba200f..5129eb0 100644
--- a/lib/io/src/unix/dir_iterator.c
+++ b/lib/io/src/unix/dir_iterator.c
@@ -127,7 +127,7 @@ static void dir_ignore_subdir(dir_iterator_t *it)
 	(void)it;
 }
 
-static int dir_open_file_ro(dir_iterator_t *it, istream_t **out)
+static int dir_open_file_ro(dir_iterator_t *it, sqfs_istream_t **out)
 {
 	(void)it;
 	*out = NULL;
diff --git a/lib/io/src/unix/istream.c b/lib/io/src/unix/istream.c
index e96bc6c..fc76bab 100644
--- a/lib/io/src/unix/istream.c
+++ b/lib/io/src/unix/istream.c
@@ -7,7 +7,7 @@
 #include "../internal.h"
 
 typedef struct {
-	istream_t base;
+	sqfs_istream_t base;
 	char *path;
 	int fd;
 
@@ -17,7 +17,7 @@ typedef struct {
 	sqfs_u8 buffer[BUFSZ];
 } file_istream_t;
 
-static int precache(istream_t *strm)
+static int precache(sqfs_istream_t *strm)
 {
 	file_istream_t *file = (file_istream_t *)strm;
 
@@ -56,7 +56,7 @@ static int precache(istream_t *strm)
 	return 0;
 }
 
-static int file_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
+static int file_get_buffered_data(sqfs_istream_t *strm, const sqfs_u8 **out,
 				  size_t *size, size_t want)
 {
 	file_istream_t *file = (file_istream_t *)strm;
@@ -76,7 +76,7 @@ static int file_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
 	return (file->eof && *size == 0) ? 1 : 0;
 }
 
-static void file_advance_buffer(istream_t *strm, size_t count)
+static void file_advance_buffer(sqfs_istream_t *strm, size_t count)
 {
 	file_istream_t *file = (file_istream_t *)strm;
 
@@ -87,7 +87,7 @@ static void file_advance_buffer(istream_t *strm, size_t count)
 	assert(file->buffer_offset <= file->buffer_used);
 }
 
-static const char *file_get_filename(istream_t *strm)
+static const char *file_get_filename(sqfs_istream_t *strm)
 {
 	file_istream_t *file = (file_istream_t *)strm;
 
@@ -105,10 +105,10 @@ static void file_destroy(sqfs_object_t *obj)
 	free(file);
 }
 
-istream_t *istream_open_handle(const char *path, int fd)
+sqfs_istream_t *istream_open_handle(const char *path, int fd)
 {
 	file_istream_t *file = calloc(1, sizeof(*file));
-	istream_t *strm = (istream_t *)file;
+	sqfs_istream_t *strm = (sqfs_istream_t *)file;
 
 	if (file == NULL) {
 		perror(path);
@@ -141,9 +141,9 @@ fail_free:
 	return NULL;
 }
 
-istream_t *istream_open_file(const char *path)
+sqfs_istream_t *istream_open_file(const char *path)
 {
-	istream_t *out;
+	sqfs_istream_t *out;
 	int fd;
 
 	fd = open(path, O_RDONLY);
@@ -159,7 +159,7 @@ istream_t *istream_open_file(const char *path)
 	return out;
 }
 
-istream_t *istream_open_stdin(void)
+sqfs_istream_t *istream_open_stdin(void)
 {
 	return istream_open_handle("stdin", STDIN_FILENO);
 }
diff --git a/lib/io/src/unix/ostream.c b/lib/io/src/unix/ostream.c
index 7093cc2..0e95167 100644
--- a/lib/io/src/unix/ostream.c
+++ b/lib/io/src/unix/ostream.c
@@ -8,7 +8,7 @@
 #include "sqfs/io.h"
 
 typedef struct {
-	ostream_t base;
+	sqfs_ostream_t base;
 	char *path;
 	int flags;
 	int fd;
@@ -85,7 +85,7 @@ fail:
 	return -1;
 }
 
-static int file_append(ostream_t *strm, const void *data, size_t size)
+static int file_append(sqfs_ostream_t *strm, const void *data, size_t size)
 {
 	file_ostream_t *file = (file_ostream_t *)strm;
 
@@ -104,7 +104,7 @@ static int file_append(ostream_t *strm, const void *data, size_t size)
 	return write_all(file, data, size);
 }
 
-static int file_flush(ostream_t *strm)
+static int file_flush(sqfs_ostream_t *strm)
 {
 	file_ostream_t *file = (file_ostream_t *)strm;
 
@@ -130,17 +130,17 @@ static void file_destroy(sqfs_object_t *obj)
 	free(file);
 }
 
-static const char *file_get_filename(ostream_t *strm)
+static const char *file_get_filename(sqfs_ostream_t *strm)
 {
 	file_ostream_t *file = (file_ostream_t *)strm;
 
 	return file->path;
 }
 
-ostream_t *ostream_open_handle(const char *path, int fd, int flags)
+sqfs_ostream_t *ostream_open_handle(const char *path, int fd, int flags)
 {
 	file_ostream_t *file = calloc(1, sizeof(*file));
-	ostream_t *strm = (ostream_t *)file;
+	sqfs_ostream_t *strm = (sqfs_ostream_t *)file;
 
 	if (file == NULL) {
 		perror(path);
@@ -175,9 +175,9 @@ fail_free:
 	return NULL;
 }
 
-ostream_t *ostream_open_file(const char *path, int flags)
+sqfs_ostream_t *ostream_open_file(const char *path, int flags)
 {
-	ostream_t *out;
+	sqfs_ostream_t *out;
 	int fd;
 
 	if (flags & SQFS_FILE_OPEN_OVERWRITE) {
@@ -193,7 +193,7 @@ ostream_t *ostream_open_file(const char *path, int flags)
 	return out;
 }
 
-ostream_t *ostream_open_stdout(void)
+sqfs_ostream_t *ostream_open_stdout(void)
 {
 	return ostream_open_handle("stdout", STDOUT_FILENO,
 				   SQFS_FILE_OPEN_NO_SPARSE);
diff --git a/lib/io/src/win32/dir_iterator.c b/lib/io/src/win32/dir_iterator.c
index b1045f1..c99fd64 100644
--- a/lib/io/src/win32/dir_iterator.c
+++ b/lib/io/src/win32/dir_iterator.c
@@ -115,7 +115,7 @@ static void dir_iterator_ignore_subdir(dir_iterator_t *it)
 	(void)it;
 }
 
-static int dir_iterator_open_file_ro(dir_iterator_t *it, istream_t **out)
+static int dir_iterator_open_file_ro(dir_iterator_t *it, sqfs_istream_t **out)
 {
 	(void)it;
 	*out = NULL;
diff --git a/lib/io/src/win32/istream.c b/lib/io/src/win32/istream.c
index d140142..223b20d 100644
--- a/lib/io/src/win32/istream.c
+++ b/lib/io/src/win32/istream.c
@@ -10,7 +10,7 @@
 #include <windows.h>
 
 typedef struct {
-	istream_t base;
+	sqfs_istream_t base;
 	char *path;
 	HANDLE hnd;
 
@@ -20,7 +20,7 @@ typedef struct {
 	sqfs_u8 buffer[BUFSZ];
 } file_istream_t;
 
-static int precache(istream_t *strm)
+static int precache(sqfs_istream_t *strm)
 {
 	file_istream_t *file = (file_istream_t *)strm;
 	DWORD diff, actual;
@@ -66,7 +66,7 @@ static int precache(istream_t *strm)
 	return 0;
 }
 
-static int file_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
+static int file_get_buffered_data(sqfs_istream_t *strm, const sqfs_u8 **out,
 				  size_t *size, size_t want)
 {
 	file_istream_t *file = (file_istream_t *)strm;
@@ -86,7 +86,7 @@ static int file_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
 	return (file->eof && *size == 0) ? 1 : 0;
 }
 
-static void file_advance_buffer(istream_t *strm, size_t count)
+static void file_advance_buffer(sqfs_istream_t *strm, size_t count)
 {
 	file_istream_t *file = (file_istream_t *)strm;
 
@@ -97,7 +97,7 @@ static void file_advance_buffer(istream_t *strm, size_t count)
 	assert(file->buffer_offset <= file->buffer_used);
 }
 
-static const char *file_get_filename(istream_t *strm)
+static const char *file_get_filename(sqfs_istream_t *strm)
 {
 	return ((file_istream_t *)strm)->path;
 }
@@ -111,10 +111,10 @@ static void file_destroy(sqfs_object_t *obj)
 	free(file);
 }
 
-istream_t *istream_open_handle(const char *path, HANDLE hnd)
+sqfs_istream_t *istream_open_handle(const char *path, HANDLE hnd)
 {
 	file_istream_t *file = calloc(1, sizeof(*file));
-	istream_t *strm = (istream_t *)file;
+	sqfs_istream_t *strm = (sqfs_istream_t *)file;
 	BOOL ret;
 
 	if (file == NULL) {
@@ -151,10 +151,10 @@ fail_free:
 	return NULL;
 }
 
-istream_t *istream_open_file(const char *path)
+sqfs_istream_t *istream_open_file(const char *path)
 {
 	WCHAR *wpath = NULL;
-	istream_t *out;
+	sqfs_istream_t *out;
 	HANDLE hnd;
 
 	wpath = path_to_windows(path);
@@ -179,7 +179,7 @@ istream_t *istream_open_file(const char *path)
 	return out;
 }
 
-istream_t *istream_open_stdin(void)
+sqfs_istream_t *istream_open_stdin(void)
 {
 	HANDLE hnd = GetStdHandle(STD_INPUT_HANDLE);
 
diff --git a/lib/io/src/win32/ostream.c b/lib/io/src/win32/ostream.c
index 26d6f96..5b099a4 100644
--- a/lib/io/src/win32/ostream.c
+++ b/lib/io/src/win32/ostream.c
@@ -11,7 +11,7 @@
 #include <windows.h>
 
 typedef struct {
-	ostream_t base;
+	sqfs_ostream_t base;
 	sqfs_u64 sparse_count;
 	char *path;
 	HANDLE hnd;
@@ -84,7 +84,7 @@ fail:
 	return -1;
 }
 
-static int file_append(ostream_t *strm, const void *data, size_t size)
+static int file_append(sqfs_ostream_t *strm, const void *data, size_t size)
 {
 	file_ostream_t *file = (file_ostream_t *)strm;
 
@@ -102,7 +102,7 @@ static int file_append(ostream_t *strm, const void *data, size_t size)
 	return write_data(file, data, size);
 }
 
-static int file_flush(ostream_t *strm)
+static int file_flush(sqfs_ostream_t *strm)
 {
 	file_ostream_t *file = (file_ostream_t *)strm;
 
@@ -126,17 +126,17 @@ static void file_destroy(sqfs_object_t *obj)
 	free(file);
 }
 
-static const char *file_get_filename(ostream_t *strm)
+static const char *file_get_filename(sqfs_ostream_t *strm)
 {
 	file_ostream_t *file = (file_ostream_t *)strm;
 
 	return file->path;
 }
 
-ostream_t *ostream_open_handle(const char *path, HANDLE hnd, int flags)
+sqfs_ostream_t *ostream_open_handle(const char *path, HANDLE hnd, int flags)
 {
 	file_ostream_t *file = calloc(1, sizeof(*file));
-	ostream_t *strm = (ostream_t *)file;
+	sqfs_ostream_t *strm = (sqfs_ostream_t *)file;
 	BOOL ret;
 
 	if (file == NULL) {
@@ -174,11 +174,11 @@ fail_free:
 	return NULL;
 }
 
-ostream_t *ostream_open_file(const char *path, int flags)
+sqfs_ostream_t *ostream_open_file(const char *path, int flags)
 {
 	int access_flags, creation_mode;
 	WCHAR *wpath = NULL;
-	ostream_t *out;
+	sqfs_ostream_t *out;
 	HANDLE hnd;
 
 	access_flags = GENERIC_WRITE;
@@ -216,7 +216,7 @@ ostream_t *ostream_open_file(const char *path, int flags)
 	return out;
 }
 
-ostream_t *ostream_open_stdout(void)
+sqfs_ostream_t *ostream_open_stdout(void)
 {
 	HANDLE hnd = GetStdHandle(STD_OUTPUT_HANDLE);
 
diff --git a/lib/io/src/xfrm/istream.c b/lib/io/src/xfrm/istream.c
index 632409c..5c23d28 100644
--- a/lib/io/src/xfrm/istream.c
+++ b/lib/io/src/xfrm/istream.c
@@ -7,9 +7,9 @@
 #include "../internal.h"
 
 typedef struct istream_xfrm_t {
-	istream_t base;
+	sqfs_istream_t base;
 
-	istream_t *wrapped;
+	sqfs_istream_t *wrapped;
 	xfrm_stream_t *xfrm;
 
 	size_t buffer_offset;
@@ -17,7 +17,7 @@ typedef struct istream_xfrm_t {
 	sqfs_u8 uncompressed[BUFSZ];
 } istream_xfrm_t;
 
-static int precache(istream_t *base)
+static int precache(sqfs_istream_t *base)
 {
 	istream_xfrm_t *xfrm = (istream_xfrm_t *)base;
 	int ret;
@@ -70,7 +70,7 @@ static int precache(istream_t *base)
 	return 0;
 }
 
-static int xfrm_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
+static int xfrm_get_buffered_data(sqfs_istream_t *strm, const sqfs_u8 **out,
 				  size_t *size, size_t want)
 {
 	istream_xfrm_t *xfrm = (istream_xfrm_t *)strm;
@@ -90,7 +90,7 @@ static int xfrm_get_buffered_data(istream_t *strm, const sqfs_u8 **out,
 	return (*size == 0) ? 1 : 0;
 }
 
-static void xfrm_advance_buffer(istream_t *strm, size_t count)
+static void xfrm_advance_buffer(sqfs_istream_t *strm, size_t count)
 {
 	istream_xfrm_t *xfrm = (istream_xfrm_t *)strm;
 
@@ -101,7 +101,7 @@ static void xfrm_advance_buffer(istream_t *strm, size_t count)
 	assert(xfrm->buffer_offset <= xfrm->buffer_used);
 }
 
-static const char *xfrm_get_filename(istream_t *strm)
+static const char *xfrm_get_filename(sqfs_istream_t *strm)
 {
 	istream_xfrm_t *xfrm = (istream_xfrm_t *)strm;
 
@@ -117,10 +117,10 @@ static void xfrm_destroy(sqfs_object_t *obj)
 	free(xfrm);
 }
 
-istream_t *istream_xfrm_create(istream_t *strm, xfrm_stream_t *xfrm)
+sqfs_istream_t *istream_xfrm_create(sqfs_istream_t *strm, xfrm_stream_t *xfrm)
 {
 	istream_xfrm_t *stream = calloc(1, sizeof(*stream));
-	istream_t *base = (istream_t *)stream;
+	sqfs_istream_t *base = (sqfs_istream_t *)stream;
 
 	if (stream == NULL)
 		goto fail;
diff --git a/lib/io/src/xfrm/ostream.c b/lib/io/src/xfrm/ostream.c
index e55e38c..81c19dd 100644
--- a/lib/io/src/xfrm/ostream.c
+++ b/lib/io/src/xfrm/ostream.c
@@ -7,9 +7,9 @@
 #include "../internal.h"
 
 typedef struct ostream_xfrm_t {
-	ostream_t base;
+	sqfs_ostream_t base;
 
-	ostream_t *wrapped;
+	sqfs_ostream_t *wrapped;
 	xfrm_stream_t *xfrm;
 
 	size_t inbuf_used;
@@ -66,7 +66,7 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish)
 	return 0;
 }
 
-static int xfrm_append(ostream_t *strm, const void *data, size_t size)
+static int xfrm_append(sqfs_ostream_t *strm, const void *data, size_t size)
 {
 	ostream_xfrm_t *xfrm = (ostream_xfrm_t *)strm;
 	size_t diff;
@@ -96,7 +96,7 @@ static int xfrm_append(ostream_t *strm, const void *data, size_t size)
 	return 0;
 }
 
-static int xfrm_flush(ostream_t *strm)
+static int xfrm_flush(sqfs_ostream_t *strm)
 {
 	ostream_xfrm_t *xfrm = (ostream_xfrm_t *)strm;
 
@@ -108,7 +108,7 @@ static int xfrm_flush(ostream_t *strm)
 	return xfrm->wrapped->flush(xfrm->wrapped);
 }
 
-static const char *xfrm_get_filename(ostream_t *strm)
+static const char *xfrm_get_filename(sqfs_ostream_t *strm)
 {
 	ostream_xfrm_t *xfrm = (ostream_xfrm_t *)strm;
 
@@ -124,10 +124,10 @@ static void xfrm_destroy(sqfs_object_t *obj)
 	free(xfrm);
 }
 
-ostream_t *ostream_xfrm_create(ostream_t *strm, xfrm_stream_t *xfrm)
+sqfs_ostream_t *ostream_xfrm_create(sqfs_ostream_t *strm, xfrm_stream_t *xfrm)
 {
 	ostream_xfrm_t *stream = calloc(1, sizeof(*stream));
-	ostream_t *base = (ostream_t *)stream;
+	sqfs_ostream_t *base = (sqfs_ostream_t *)stream;
 
 	if (stream == NULL)
 		goto fail;