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>

3 files changed, 20 insertions, 20 deletions

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);