Refactor: rename sqfs_dir_entry_t to sqfs_dir_node_t

Exact operation performed:

	git ls-files -z | \
	xargs -0 sed -i -e 's/sqfs_dir_entry_t/sqfs_dir_node_t/g'

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

4 files changed, 12 insertions, 12 deletions

diff --git a/lib/sqfs/src/dir_reader/dir_reader.c b/lib/sqfs/src/dir_reader/dir_reader.c
index d70f729..aea6841 100644
--- a/lib/sqfs/src/dir_reader/dir_reader.c
+++ b/lib/sqfs/src/dir_reader/dir_reader.c
@@ -206,12 +206,12 @@ int sqfs_dir_reader_open_dir(sqfs_dir_reader_t *rd,
 	return 0;
 }
 
-static int mk_dummy_entry(const char *str, sqfs_dir_entry_t **out)
+static int mk_dummy_entry(const char *str, sqfs_dir_node_t **out)
 {
 	size_t len = strlen(str);
-	sqfs_dir_entry_t *ent;
+	sqfs_dir_node_t *ent;
 
-	ent = calloc(1, sizeof(sqfs_dir_entry_t) + len + 1);
+	ent = calloc(1, sizeof(sqfs_dir_node_t) + len + 1);
 	if (ent == NULL)
 		return SQFS_ERROR_ALLOC;
 
@@ -224,7 +224,7 @@ static int mk_dummy_entry(const char *str, sqfs_dir_entry_t **out)
 	return 0;
 }
 
-int sqfs_dir_reader_read(sqfs_dir_reader_t *rd, sqfs_dir_entry_t **out)
+int sqfs_dir_reader_read(sqfs_dir_reader_t *rd, sqfs_dir_node_t **out)
 {
 	int err;
 
@@ -265,7 +265,7 @@ int sqfs_dir_reader_rewind(sqfs_dir_reader_t *rd)
 
 int sqfs_dir_reader_find(sqfs_dir_reader_t *rd, const char *name)
 {
-	sqfs_dir_entry_t *ent;
+	sqfs_dir_node_t *ent;
 	int ret;
 
 	ret = sqfs_dir_reader_rewind(rd);
diff --git a/lib/sqfs/src/dir_reader/read_tree.c b/lib/sqfs/src/dir_reader/read_tree.c
index 91cc2c0..7d6bf67 100644
--- a/lib/sqfs/src/dir_reader/read_tree.c
+++ b/lib/sqfs/src/dir_reader/read_tree.c
@@ -64,7 +64,7 @@ static int fill_dir(sqfs_dir_reader_t *dr, sqfs_tree_node_t *root,
 {
 	sqfs_tree_node_t *n, *prev, **tail;
 	sqfs_inode_generic_t *inode;
-	sqfs_dir_entry_t *ent;
+	sqfs_dir_node_t *ent;
 	int err;
 
 	tail = &root->children;
@@ -188,7 +188,7 @@ int sqfs_dir_reader_get_full_hierarchy(sqfs_dir_reader_t *rd,
 {
 	sqfs_tree_node_t *root, *tail, *new;
 	sqfs_inode_generic_t *inode;
-	sqfs_dir_entry_t *ent;
+	sqfs_dir_node_t *ent;
 	const char *ptr;
 	int ret;
 
diff --git a/lib/sqfs/src/dir_writer.c b/lib/sqfs/src/dir_writer.c
index d2b72df..3f7fed1 100644
--- a/lib/sqfs/src/dir_writer.c
+++ b/lib/sqfs/src/dir_writer.c
@@ -235,7 +235,7 @@ static size_t get_conseq_entry_count(sqfs_u32 offset, dir_entry_t *head)
 		if (diff > 32767 || diff < -32767)
 			break;
 
-		size += sizeof(sqfs_dir_entry_t) + it->name_len;
+		size += sizeof(sqfs_dir_node_t) + it->name_len;
 
 		if (count > 0 && size > SQFS_META_BLOCK_SIZE)
 			break;
@@ -286,7 +286,7 @@ static int add_header(sqfs_dir_writer_t *writer, size_t count,
 int sqfs_dir_writer_end(sqfs_dir_writer_t *writer)
 {
 	dir_entry_t *it, *first;
-	sqfs_dir_entry_t ent;
+	sqfs_dir_node_t ent;
 	sqfs_u16 *diff_u16;
 	size_t i, count;
 	sqfs_u32 offset;
diff --git a/lib/sqfs/src/readdir.c b/lib/sqfs/src/readdir.c
index e2dbcd4..9feaf22 100644
--- a/lib/sqfs/src/readdir.c
+++ b/lib/sqfs/src/readdir.c
@@ -35,9 +35,9 @@ int sqfs_meta_reader_read_dir_header(sqfs_meta_reader_t *m,
 }
 
 int sqfs_meta_reader_read_dir_ent(sqfs_meta_reader_t *m,
-				  sqfs_dir_entry_t **result)
+				  sqfs_dir_node_t **result)
 {
-	sqfs_dir_entry_t ent, *out;
+	sqfs_dir_node_t ent, *out;
 	sqfs_u16 *diff_u16;
 	int err;
 
@@ -90,7 +90,7 @@ int sqfs_readdir_state_init(sqfs_readdir_state_t *s, const sqfs_super_t *super,
 }
 
 int sqfs_meta_reader_readdir(sqfs_meta_reader_t *m, sqfs_readdir_state_t *it,
-			     sqfs_dir_entry_t **ent,
+			     sqfs_dir_node_t **ent,
 			     sqfs_u32 *inum, sqfs_u64 *iref)
 {
 	size_t count;