Refactor: rename dir_iterator_t to sqfs_dir_iterator_t

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

4 files changed, 13 insertions, 12 deletions

diff --git a/lib/tar/src/iterator.c b/lib/tar/src/iterator.c
index a2708a0..85466ba 100644
--- a/lib/tar/src/iterator.c
+++ b/lib/tar/src/iterator.c
@@ -19,7 +19,7 @@
 #include <fnmatch.h>
 
 typedef struct {
-	dir_iterator_t base;
+	sqfs_dir_iterator_t base;
 	tar_header_decoded_t current;
 	sqfs_istream_t *stream;
 	char **excludedirs;
@@ -167,7 +167,7 @@ static void strm_destroy(sqfs_object_t *obj)
 
 /*****************************************************************************/
 
-static int it_next(dir_iterator_t *it, sqfs_dir_entry_t **out)
+static int it_next(sqfs_dir_iterator_t *it, sqfs_dir_entry_t **out)
 {
 	tar_iterator_t *tar = (tar_iterator_t *)it;
 	size_t idx;
@@ -243,7 +243,7 @@ fail:
 	return tar->state;
 }
 
-static int it_read_link(dir_iterator_t *it, char **out)
+static int it_read_link(sqfs_dir_iterator_t *it, char **out)
 {
 	tar_iterator_t *tar = (tar_iterator_t *)it;
 
@@ -258,20 +258,20 @@ static int it_read_link(dir_iterator_t *it, char **out)
 	return (*out == NULL) ? SQFS_ERROR_ALLOC : 0;
 }
 
-static int it_open_subdir(dir_iterator_t *it, dir_iterator_t **out)
+static int it_open_subdir(sqfs_dir_iterator_t *it, sqfs_dir_iterator_t **out)
 {
 	(void)it;
 	*out = NULL;
 	return SQFS_ERROR_UNSUPPORTED;
 }
 
-static void it_ignore_subdir(dir_iterator_t *it)
+static void it_ignore_subdir(sqfs_dir_iterator_t *it)
 {
 	(void)it;
 	/* TODO: skip list */
 }
 
-static int it_open_file_ro(dir_iterator_t *it, sqfs_istream_t **out)
+static int it_open_file_ro(sqfs_dir_iterator_t *it, sqfs_istream_t **out)
 {
 	tar_iterator_t *tar = (tar_iterator_t *)it;
 	tar_istream_t *strm;
@@ -302,7 +302,7 @@ static int it_open_file_ro(dir_iterator_t *it, sqfs_istream_t **out)
 	return 0;
 }
 
-static int it_read_xattr(dir_iterator_t *it, sqfs_xattr_t **out)
+static int it_read_xattr(sqfs_dir_iterator_t *it, sqfs_xattr_t **out)
 {
 	tar_iterator_t *tar = (tar_iterator_t *)it;
 
@@ -359,10 +359,11 @@ static int tar_probe(const sqfs_u8 *data, size_t size)
 	return 0;
 }
 
-dir_iterator_t *tar_open_stream(sqfs_istream_t *strm, tar_iterator_opts *opts)
+sqfs_dir_iterator_t *tar_open_stream(sqfs_istream_t *strm,
+				     tar_iterator_opts *opts)
 {
 	tar_iterator_t *tar = calloc(1, sizeof(*tar));
-	dir_iterator_t *it = (dir_iterator_t *)tar;
+	sqfs_dir_iterator_t *it = (sqfs_dir_iterator_t *)tar;
 	xfrm_stream_t *xfrm = NULL;
 	const sqfs_u8 *ptr;
 	size_t size;
diff --git a/lib/tar/test/tar_iterator.c b/lib/tar/test/tar_iterator.c
index cd24c94..b90d5ca 100644
--- a/lib/tar/test/tar_iterator.c
+++ b/lib/tar/test/tar_iterator.c
@@ -31,7 +31,7 @@ static const char *fname = STRVALUE(TESTFNAME);
 int main(int argc, char **argv)
 {
 	sqfs_istream_t *fp, *ti, *ti2;
-	dir_iterator_t *it;
+	sqfs_dir_iterator_t *it;
 	sqfs_dir_entry_t *ent;
 	char buffer[100];
 	sqfs_s32 ret;
diff --git a/lib/tar/test/tar_iterator2.c b/lib/tar/test/tar_iterator2.c
index 7b22af3..630f579 100644
--- a/lib/tar/test/tar_iterator2.c
+++ b/lib/tar/test/tar_iterator2.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 {
 	unsigned char buffer[941];
 	sqfs_istream_t *fp, *ti;
-	dir_iterator_t *it;
+	sqfs_dir_iterator_t *it;
 	sqfs_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 7973441..05940a2 100644
--- a/lib/tar/test/tar_iterator3.c
+++ b/lib/tar/test/tar_iterator3.c
@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
 	sqfs_istream_t *fp, *ti;
-	dir_iterator_t *it;
+	sqfs_dir_iterator_t *it;
 	char buffer[100];
 	sqfs_dir_entry_t *ent;
 	char *link;