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>

14 files changed, 19 insertions, 18 deletions

diff --git a/bin/gensquashfs/src/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c
index 4adc24f..89624f4 100644
--- a/bin/gensquashfs/src/filemap_xattr.c
+++ b/bin/gensquashfs/src/filemap_xattr.c
@@ -159,7 +159,7 @@ xattr_open_map_file(const char *path) {
 	struct XattrMap *map;
 	size_t line_num = 1;
 	char *p = NULL;
-	istream_t *file = istream_open_file(path);
+	sqfs_istream_t *file = istream_open_file(path);
 	if (file == NULL) {
 		return NULL;
 	}
diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c
index 325bce2..efb5d43 100644
--- a/bin/gensquashfs/src/fstree_from_file.c
+++ b/bin/gensquashfs/src/fstree_from_file.c
@@ -273,7 +273,8 @@ out_desc:
 	return -1;
 }
 
-int fstree_from_file_stream(fstree_t *fs, istream_t *fp, const char *basepath)
+int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *fp,
+			    const char *basepath)
 {
 	const char *filename;
 	size_t line_num = 1;
@@ -309,7 +310,7 @@ fail_line:
 
 int fstree_from_file(fstree_t *fs, const char *filename, const char *basepath)
 {
-	istream_t *fp;
+	sqfs_istream_t *fp;
 	int ret;
 
 	fp = istream_open_file(filename);
diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c
index b64a217..cdef359 100644
--- a/bin/gensquashfs/src/mkfs.c
+++ b/bin/gensquashfs/src/mkfs.c
@@ -137,7 +137,7 @@ static void override_owner_dfs(const options_t *opt, tree_node_t *n)
 int main(int argc, char **argv)
 {
 	int status = EXIT_FAILURE;
-	istream_t *sortfile = NULL;
+	sqfs_istream_t *sortfile = NULL;
 	void *sehnd = NULL;
 	void *xattrmap = NULL;
 	sqfs_writer_t sqfs;
diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h
index 0a9a3b3..5c97750 100644
--- a/bin/gensquashfs/src/mkfs.h
+++ b/bin/gensquashfs/src/mkfs.h
@@ -104,7 +104,7 @@ void selinux_close_context_file(void *sehnd);
 int fstree_from_file(fstree_t *fs, const char *filename,
 		     const char *basepath);
 
-int fstree_from_file_stream(fstree_t *fs, istream_t *file,
+int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *file,
 			    const char *basepath);
 
 /*
@@ -114,7 +114,7 @@ int fstree_from_file_stream(fstree_t *fs, istream_t *file,
  */
 int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir);
 
-int fstree_sort_files(fstree_t *fs, istream_t *sortfile);
+int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile);
 
 int glob_files(fstree_t *fs, const char *filename, size_t line_num,
 	       const dir_entry_t *ent,
diff --git a/bin/gensquashfs/src/sort_by_file.c b/bin/gensquashfs/src/sort_by_file.c
index e2b6338..6e96d5b 100644
--- a/bin/gensquashfs/src/sort_by_file.c
+++ b/bin/gensquashfs/src/sort_by_file.c
@@ -232,7 +232,7 @@ static void sort_file_list(fstree_t *fs)
 	fs->files = out;
 }
 
-int fstree_sort_files(fstree_t *fs, istream_t *sortfile)
+int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile)
 {
 	const char *filename;
 	size_t line_num = 1;
diff --git a/bin/gensquashfs/test/fstree_from_file.c b/bin/gensquashfs/test/fstree_from_file.c
index e54111c..a5500dc 100644
--- a/bin/gensquashfs/test/fstree_from_file.c
+++ b/bin/gensquashfs/test/fstree_from_file.c
@@ -25,7 +25,7 @@ const char *listing =
 int main(int argc, char **argv)
 {
 	fstree_defaults_t fsd;
-	istream_t *file;
+	sqfs_istream_t *file;
 	tree_node_t *n;
 	fstree_t fs;
 	(void)argc; (void)argv;
diff --git a/bin/gensquashfs/test/sort_file.c b/bin/gensquashfs/test/sort_file.c
index af50260..063f95d 100644
--- a/bin/gensquashfs/test/sort_file.c
+++ b/bin/gensquashfs/test/sort_file.c
@@ -111,8 +111,8 @@ static int flags[] = {
 
 int main(int argc, char **argv)
 {
+	sqfs_istream_t *memstream;
 	fstree_defaults_t fsd;
-	istream_t *memstream;
 	tree_node_t *n;
 	fstree_t fs;
 	size_t i;
diff --git a/bin/rdsquashfs/src/fill_files.c b/bin/rdsquashfs/src/fill_files.c
index f482abe..e692ee3 100644
--- a/bin/rdsquashfs/src/fill_files.c
+++ b/bin/rdsquashfs/src/fill_files.c
@@ -136,7 +136,7 @@ static int gen_file_list_dfs(const sqfs_tree_node_t *n)
 static int fill_files(sqfs_data_reader_t *data, int flags)
 {
 	int ret, openflags;
-	ostream_t *fp;
+	sqfs_ostream_t *fp;
 	size_t i;
 
 	openflags = SQFS_FILE_OPEN_OVERWRITE;
diff --git a/bin/rdsquashfs/src/rdsquashfs.c b/bin/rdsquashfs/src/rdsquashfs.c
index bdcc5a0..ad85e68 100644
--- a/bin/rdsquashfs/src/rdsquashfs.c
+++ b/bin/rdsquashfs/src/rdsquashfs.c
@@ -207,7 +207,7 @@ int main(int argc, char **argv)
 			goto out;
 		break;
 	case OP_CAT: {
-		ostream_t *fp;
+		sqfs_ostream_t *fp;
 
 		if (!S_ISREG(n->inode->base.mode)) {
 			fprintf(stderr, "/%s: not a regular file\n",
diff --git a/bin/sqfs2tar/src/sqfs2tar.c b/bin/sqfs2tar/src/sqfs2tar.c
index fd8d5fa..e90aa56 100644
--- a/bin/sqfs2tar/src/sqfs2tar.c
+++ b/bin/sqfs2tar/src/sqfs2tar.c
@@ -9,7 +9,7 @@
 sqfs_xattr_reader_t *xr;
 sqfs_data_reader_t *data;
 sqfs_super_t super;
-ostream_t *out_file = NULL;
+sqfs_ostream_t *out_file = NULL;
 
 static sqfs_file_t *file;
 
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
 
 	if (compressor > 0) {
 		xfrm_stream_t *xfrm = compressor_stream_create(compressor,NULL);
-		ostream_t *strm;
+		sqfs_ostream_t *strm;
 
 		if (xfrm == NULL)
 			goto out;
diff --git a/bin/sqfs2tar/src/sqfs2tar.h b/bin/sqfs2tar/src/sqfs2tar.h
index e176008..bb07092 100644
--- a/bin/sqfs2tar/src/sqfs2tar.h
+++ b/bin/sqfs2tar/src/sqfs2tar.h
@@ -42,7 +42,7 @@ void process_args(int argc, char **argv);
 extern sqfs_xattr_reader_t *xr;
 extern sqfs_data_reader_t *data;
 extern sqfs_super_t super;
-extern ostream_t *out_file;
+extern sqfs_ostream_t *out_file;
 
 char *assemble_tar_path(char *name, bool is_dir);
 
diff --git a/bin/sqfsdiff/src/extract.c b/bin/sqfsdiff/src/extract.c
index 3c8b568..43e9b97 100644
--- a/bin/sqfsdiff/src/extract.c
+++ b/bin/sqfsdiff/src/extract.c
@@ -10,7 +10,7 @@ static int extract(sqfs_data_reader_t *data, const sqfs_inode_generic_t *inode,
 		   const char *prefix, const char *path, size_t block_size)
 {
 	char *ptr, *temp;
-	ostream_t *fp;
+	sqfs_ostream_t *fp;
 
 	temp = alloca(strlen(prefix) + strlen(path) + 2);
 	sprintf(temp, "%s/%s", prefix, path);
diff --git a/bin/tar2sqfs/src/process_tarball.c b/bin/tar2sqfs/src/process_tarball.c
index 69d430d..5e7f030 100644
--- a/bin/tar2sqfs/src/process_tarball.c
+++ b/bin/tar2sqfs/src/process_tarball.c
@@ -10,8 +10,8 @@ static int write_file(sqfs_writer_t *sqfs, dir_iterator_t *it,
 		      const dir_entry_t *ent, tree_node_t *n)
 {
 	int flags = 0, ret = 0;
-	ostream_t *out;
-	istream_t *in;
+	sqfs_ostream_t *out;
+	sqfs_istream_t *in;
 
 	if (no_tail_pack && ent->size > cfg.block_size)
 		flags |= SQFS_BLK_DONT_FRAGMENT;
diff --git a/bin/tar2sqfs/src/tar2sqfs.c b/bin/tar2sqfs/src/tar2sqfs.c
index b09f920..f7ed060 100644
--- a/bin/tar2sqfs/src/tar2sqfs.c
+++ b/bin/tar2sqfs/src/tar2sqfs.c
@@ -9,7 +9,7 @@
 int main(int argc, char **argv)
 {
 	int status = EXIT_FAILURE;
-	istream_t *input_file = NULL;
+	sqfs_istream_t *input_file = NULL;
 	dir_iterator_t *tar = NULL;
 	sqfs_writer_t sqfs;