From 625368eb5bcb9954ad190af50962e6b7c2fd9c4c Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 27 Sep 2019 16:43:11 +0200 Subject: Cleanup: remove most of the payload pointer magic from libfstree Now that dir_info_t and file_info_t have reasonably small, use them in tree_node_t directly instead of doing pointer arithmetic magic on the payload area. Signed-off-by: David Oberhollenzer --- lib/fstree/gen_inode_table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/fstree/gen_inode_table.c') diff --git a/lib/fstree/gen_inode_table.c b/lib/fstree/gen_inode_table.c index 04f68da..80686d6 100644 --- a/lib/fstree/gen_inode_table.c +++ b/lib/fstree/gen_inode_table.c @@ -14,7 +14,7 @@ static size_t count_nodes(tree_node_t *root) { - tree_node_t *n = root->data.dir->children; + tree_node_t *n = root->data.dir.children; size_t count = 1; while (n != NULL) { @@ -34,7 +34,7 @@ static void map_child_nodes(fstree_t *fs, tree_node_t *root, size_t *counter) bool has_subdirs = false; tree_node_t *it; - for (it = root->data.dir->children; it != NULL; it = it->next) { + for (it = root->data.dir.children; it != NULL; it = it->next) { if (S_ISDIR(it->mode)) { has_subdirs = true; break; @@ -42,13 +42,13 @@ static void map_child_nodes(fstree_t *fs, tree_node_t *root, size_t *counter) } if (has_subdirs) { - for (it = root->data.dir->children; it != NULL; it = it->next) { + for (it = root->data.dir.children; it != NULL; it = it->next) { if (S_ISDIR(it->mode)) map_child_nodes(fs, it, counter); } } - for (it = root->data.dir->children; it != NULL; it = it->next) { + for (it = root->data.dir.children; it != NULL; it = it->next) { it->inode_num = *counter; *counter += 1; -- cgit v1.2.3