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, 17 insertions, 17 deletions

diff --git a/lib/tar/test/tar_big_file.c b/lib/tar/test/tar_big_file.c
index deb41f4..444548b 100644
--- a/lib/tar/test/tar_big_file.c
+++ b/lib/tar/test/tar_big_file.c
@@ -12,7 +12,7 @@
 int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
-	istream_t *fp;
+	sqfs_istream_t *fp;
 	(void)argc; (void)argv;
 
 	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
diff --git a/lib/tar/test/tar_fuzz.c b/lib/tar/test/tar_fuzz.c
index 21e6978..bdea98e 100644
--- a/lib/tar/test/tar_fuzz.c
+++ b/lib/tar/test/tar_fuzz.c
@@ -15,7 +15,7 @@
 int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
-	istream_t *fp;
+	sqfs_istream_t *fp;
 	int ret;
 
 	if (argc != 2) {
diff --git a/lib/tar/test/tar_iterator.c b/lib/tar/test/tar_iterator.c
index 21bd3e6..25e1389 100644
--- a/lib/tar/test/tar_iterator.c
+++ b/lib/tar/test/tar_iterator.c
@@ -30,7 +30,7 @@ static const char *fname = STRVALUE(TESTFNAME);
 
 int main(int argc, char **argv)
 {
-	istream_t *fp, *ti, *ti2;
+	sqfs_istream_t *fp, *ti, *ti2;
 	dir_iterator_t *it;
 	dir_entry_t *ent;
 	char buffer[100];
diff --git a/lib/tar/test/tar_iterator2.c b/lib/tar/test/tar_iterator2.c
index 7f1f3bf..6f472ae 100644
--- a/lib/tar/test/tar_iterator2.c
+++ b/lib/tar/test/tar_iterator2.c
@@ -44,8 +44,8 @@ static int byte_from_offset(uint64_t offset)
 int main(int argc, char **argv)
 {
 	unsigned char buffer[941];
+	sqfs_istream_t *fp, *ti;
 	dir_iterator_t *it;
-	istream_t *fp, *ti;
 	dir_entry_t *ent;
 	uint64_t offset;
 	sqfs_s32 i, ret;
diff --git a/lib/tar/test/tar_iterator3.c b/lib/tar/test/tar_iterator3.c
index b2ad6f9..39e7b42 100644
--- a/lib/tar/test/tar_iterator3.c
+++ b/lib/tar/test/tar_iterator3.c
@@ -13,8 +13,8 @@
 
 int main(int argc, char **argv)
 {
+	sqfs_istream_t *fp, *ti;
 	dir_iterator_t *it;
-	istream_t *fp, *ti;
 	char buffer[100];
 	dir_entry_t *ent;
 	char *link;
diff --git a/lib/tar/test/tar_simple.c b/lib/tar/test/tar_simple.c
index cb38abb..656e59b 100644
--- a/lib/tar/test/tar_simple.c
+++ b/lib/tar/test/tar_simple.c
@@ -37,9 +37,9 @@ static const char *fname = STRVALUE(TESTFNAME);
 int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
+	sqfs_istream_t *fp;
 	char buffer[6];
 	sqfs_s64 ts;
-	istream_t *fp;
 	(void)argc; (void)argv;
 
 	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
diff --git a/lib/tar/test/tar_sparse.c b/lib/tar/test/tar_sparse.c
index 27ce053..99d4639 100644
--- a/lib/tar/test/tar_sparse.c
+++ b/lib/tar/test/tar_sparse.c
@@ -13,7 +13,7 @@ static void test_case_sparse(const char *path)
 {
 	tar_header_decoded_t hdr;
 	sparse_map_t *sparse;
-	istream_t *fp;
+	sqfs_istream_t *fp;
 
 	fp = istream_open_file(path);
 	TEST_NOT_NULL(fp);
diff --git a/lib/tar/test/tar_sparse_gnu.c b/lib/tar/test/tar_sparse_gnu.c
index 19ddd0a..675ef9a 100644
--- a/lib/tar/test/tar_sparse_gnu.c
+++ b/lib/tar/test/tar_sparse_gnu.c
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
 	sparse_map_t *sparse;
-	istream_t *fp;
+	sqfs_istream_t *fp;
 	(void)argc; (void)argv;
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
diff --git a/lib/tar/test/tar_target_filled.c b/lib/tar/test/tar_target_filled.c
index e2e1798..815728a 100644
--- a/lib/tar/test/tar_target_filled.c
+++ b/lib/tar/test/tar_target_filled.c
@@ -12,8 +12,8 @@
 int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
+	sqfs_istream_t *fp;
 	char buffer[16];
-	istream_t *fp;
 	(void)argc; (void)argv;
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
diff --git a/lib/tar/test/tar_write_simple.c b/lib/tar/test/tar_write_simple.c
index b34c9c5..98ac25b 100644
--- a/lib/tar/test/tar_write_simple.c
+++ b/lib/tar/test/tar_write_simple.c
@@ -14,10 +14,10 @@
 
 /*****************************************************************************/
 
-static int buffer_append(ostream_t *strm, const void *data, size_t size);
-static const char *buffer_get_filename(ostream_t *strm);
+static int buffer_append(sqfs_ostream_t *strm, const void *data, size_t size);
+static const char *buffer_get_filename(sqfs_ostream_t *strm);
 
-static ostream_t mem_stream = {
+static sqfs_ostream_t mem_stream = {
 	{ 1, NULL, NULL },
 	buffer_append,
 	NULL,
@@ -29,7 +29,7 @@ static size_t wr_offset = 0;
 
 static sqfs_u8 rd_buffer[1024 * 10];
 
-static int buffer_append(ostream_t *strm, const void *data, size_t size)
+static int buffer_append(sqfs_ostream_t *strm, const void *data, size_t size)
 {
 	TEST_ASSERT(strm == &mem_stream);
 	TEST_ASSERT(wr_offset < sizeof(wr_buffer));
@@ -46,7 +46,7 @@ static int buffer_append(ostream_t *strm, const void *data, size_t size)
 	return 0;
 }
 
-static const char *buffer_get_filename(ostream_t *strm)
+static const char *buffer_get_filename(sqfs_ostream_t *strm)
 {
 	TEST_ASSERT(strm == &mem_stream);
 	return "dummy";
@@ -79,8 +79,8 @@ static sqfs_xattr_t *mkxattr_chain(void)
 int main(int argc, char **argv)
 {
 	sqfs_xattr_t *xattr;
+	sqfs_istream_t *fp;
 	struct stat sb;
-	istream_t *fp;
 	int ret;
 	(void)argc; (void)argv;
 
diff --git a/lib/tar/test/tar_xattr.c b/lib/tar/test/tar_xattr.c
index 1577fc7..657b73d 100644
--- a/lib/tar/test/tar_xattr.c
+++ b/lib/tar/test/tar_xattr.c
@@ -13,8 +13,8 @@
 int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
+	sqfs_istream_t *fp;
 	char buffer[6];
-	istream_t *fp;
 	(void)argc; (void)argv;
 
 	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
diff --git a/lib/tar/test/tar_xattr_bin.c b/lib/tar/test/tar_xattr_bin.c
index 129d227..f897bce 100644
--- a/lib/tar/test/tar_xattr_bin.c
+++ b/lib/tar/test/tar_xattr_bin.c
@@ -21,8 +21,8 @@ static const uint8_t value[] = {
 int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
+	sqfs_istream_t *fp;
 	char buffer[6];
-	istream_t *fp;
 	(void)argc; (void)argv;
 
 	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));