8 files changed, 22 insertions, 22 deletions
diff --git a/lib/io/src/dir_entry.c b/lib/io/src/dir_entry.c
index 15f078f..1bfc887 100644
--- a/lib/io/src/dir_entry.c
+++ b/lib/io/src/dir_entry.c
@@ -10,10 +10,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-dir_entry_t *dir_entry_create(const char *name)
+sqfs_dir_entry_t *dir_entry_create(const char *name)
 {
 	size_t len, name_len;
-	dir_entry_t *out;
+	sqfs_dir_entry_t *out;
 
 	name_len = strlen(name);
 	if (SZ_ADD_OV(name_len, 1, &name_len))
diff --git a/lib/io/src/dir_tree_iterator.c b/lib/io/src/dir_tree_iterator.c
index 4303817..989907b 100644
--- a/lib/io/src/dir_tree_iterator.c
+++ b/lib/io/src/dir_tree_iterator.c
@@ -51,7 +51,7 @@ static int push(dir_tree_iterator_t *it, const char *name, dir_iterator_t *dir)
 	return 0;
 }
 
-static bool should_skip(const dir_tree_iterator_t *dir, const dir_entry_t *ent)
+static bool should_skip(const dir_tree_iterator_t *dir, const sqfs_dir_entry_t *ent)
 {
 	unsigned int type_mask;
 
@@ -76,7 +76,7 @@ static bool should_skip(const dir_tree_iterator_t *dir, const dir_entry_t *ent)
 	return (dir->cfg.flags & type_mask) != 0;
 }
 
-static dir_entry_t *expand_path(const dir_tree_iterator_t *it, dir_entry_t *ent)
+static sqfs_dir_entry_t *expand_path(const dir_tree_iterator_t *it, sqfs_dir_entry_t *ent)
 {
 	size_t slen = strlen(ent->name) + 1, plen = 0;
 	dir_stack_t *sit;
@@ -120,7 +120,7 @@ static dir_entry_t *expand_path(const dir_tree_iterator_t *it, dir_entry_t *ent)
 	return ent;
 }
 
-static void apply_changes(const dir_tree_iterator_t *it, dir_entry_t *ent)
+static void apply_changes(const dir_tree_iterator_t *it, sqfs_dir_entry_t *ent)
 {
 	if (!(it->cfg.flags & DIR_SCAN_KEEP_TIME))
 		ent->mtime = it->cfg.def_mtime;
@@ -149,11 +149,11 @@ static void destroy(sqfs_object_t *obj)
 	free(it);
 }
 
-static int next(dir_iterator_t *base, dir_entry_t **out)
+static int next(dir_iterator_t *base, sqfs_dir_entry_t **out)
 {
 	dir_tree_iterator_t *it = (dir_tree_iterator_t *)base;
 	dir_iterator_t *sub;
-	dir_entry_t *ent;
+	sqfs_dir_entry_t *ent;
 	int ret;
 retry:
 	*out = NULL;
diff --git a/lib/io/src/unix/dir_iterator.c b/lib/io/src/unix/dir_iterator.c
index 5129eb0..99713fd 100644
--- a/lib/io/src/unix/dir_iterator.c
+++ b/lib/io/src/unix/dir_iterator.c
@@ -73,7 +73,7 @@ static int dir_read_link(dir_iterator_t *base, char **out)
 	return 0;
 }
 
-static int dir_next(dir_iterator_t *base, dir_entry_t **out)
+static int dir_next(dir_iterator_t *base, sqfs_dir_entry_t **out)
 {
 	unix_dir_iterator_t *it = (unix_dir_iterator_t *)base;
 
diff --git a/lib/io/src/win32/dir_iterator.c b/lib/io/src/win32/dir_iterator.c
index 22b4870..b7a47b9 100644
--- a/lib/io/src/win32/dir_iterator.c
+++ b/lib/io/src/win32/dir_iterator.c
@@ -50,10 +50,10 @@ static int dir_iterator_read_link(dir_iterator_t *it, char **out)
 	return SQFS_ERROR_UNSUPPORTED;
 }
 
-static int dir_iterator_next(dir_iterator_t *it, dir_entry_t **out)
+static int dir_iterator_next(dir_iterator_t *it, sqfs_dir_entry_t **out)
 {
 	dir_iterator_win32_t *w32 = (dir_iterator_win32_t *)it;
-	dir_entry_t *ent = NULL;
+	sqfs_dir_entry_t *ent = NULL;
 	DWORD length;
 
 	if (w32->state == 0 && !w32->is_first) {
diff --git a/lib/io/test/dir_iterator.c b/lib/io/test/dir_iterator.c
index 57e76ab..1f04b96 100644
--- a/lib/io/test/dir_iterator.c
+++ b/lib/io/test/dir_iterator.c
@@ -13,8 +13,8 @@
 
 static int compare_entries(const void *a, const void *b)
 {
-	const dir_entry_t *const *lhs = a;
-	const dir_entry_t *const *rhs = b;
+	const sqfs_dir_entry_t *const *lhs = a;
+	const sqfs_dir_entry_t *const *rhs = b;
 
 	return strcmp((*lhs)->name, (*rhs)->name);
 }
@@ -22,7 +22,7 @@ static int compare_entries(const void *a, const void *b)
 int main(int argc, char **argv)
 {
 	dir_iterator_t *dir, *suba, *subb, *subc, *sub;
-	dir_entry_t *dent, *ent[6];
+	sqfs_dir_entry_t *dent, *ent[6];
 	size_t i;
 	int ret;
 	(void)argc; (void)argv;
diff --git a/lib/io/test/dir_tree_iterator.c b/lib/io/test/dir_tree_iterator.c
index 0c735e2..14fad7e 100644
--- a/lib/io/test/dir_tree_iterator.c
+++ b/lib/io/test/dir_tree_iterator.c
@@ -13,15 +13,15 @@
 
 static int compare_entries(const void *a, const void *b)
 {
-	const dir_entry_t *const *lhs = a;
-	const dir_entry_t *const *rhs = b;
+	const sqfs_dir_entry_t *const *lhs = a;
+	const sqfs_dir_entry_t *const *rhs = b;
 
 	return strcmp((*lhs)->name, (*rhs)->name);
 }
 
 int main(int argc, char **argv)
 {
-	dir_entry_t *ent[17];
+	sqfs_dir_entry_t *ent[17];
 	dir_iterator_t *dir;
 	dir_tree_cfg_t cfg;
 	size_t i;
diff --git a/lib/io/test/dir_tree_iterator2.c b/lib/io/test/dir_tree_iterator2.c
index 280fa78..961cd39 100644
--- a/lib/io/test/dir_tree_iterator2.c
+++ b/lib/io/test/dir_tree_iterator2.c
@@ -13,15 +13,15 @@
 
 static int compare_entries(const void *a, const void *b)
 {
-	const dir_entry_t *const *lhs = a;
-	const dir_entry_t *const *rhs = b;
+	const sqfs_dir_entry_t *const *lhs = a;
+	const sqfs_dir_entry_t *const *rhs = b;
 
 	return strcmp((*lhs)->name, (*rhs)->name);
 }
 
 int main(int argc, char **argv)
 {
-	dir_entry_t *ent[17];
+	sqfs_dir_entry_t *ent[17];
 	dir_iterator_t *dir;
 	dir_tree_cfg_t cfg;
 	size_t i;
diff --git a/lib/io/test/dir_tree_iterator3.c b/lib/io/test/dir_tree_iterator3.c
index 180beff..5e414d7 100644
--- a/lib/io/test/dir_tree_iterator3.c
+++ b/lib/io/test/dir_tree_iterator3.c
@@ -13,15 +13,15 @@
 
 static int compare_entries(const void *a, const void *b)
 {
-	const dir_entry_t *const *lhs = a;
-	const dir_entry_t *const *rhs = b;
+	const sqfs_dir_entry_t *const *lhs = a;
+	const sqfs_dir_entry_t *const *rhs = b;
 
 	return strcmp((*lhs)->name, (*rhs)->name);
 }
 
 int main(int argc, char **argv)
 {
-	dir_entry_t *ent[17];
+	sqfs_dir_entry_t *ent[17];
 	dir_iterator_t *dir;
 	dir_tree_cfg_t cfg;
 	size_t i;