Internalize fstree_mknode, consolidate fstree functionality

The fstree_mknode function is only used internally, remove the
declaration from the header and internalize it. The code using it is
consolidated into fstree.c.

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

1 files changed, 16 insertions, 11 deletions

diff --git a/lib/fstree/test/mknode_dir.c b/lib/fstree/test/mknode_dir.c
index a5f6d9a..c2812ac 100644
--- a/lib/fstree/test/mknode_dir.c
+++ b/lib/fstree/test/mknode_dir.c
@@ -11,12 +11,17 @@
 
 int main(int argc, char **argv)
 {
+	fstree_defaults_t defaults;
 	tree_node_t *root, *a, *b;
 	struct stat sb;
 	fstree_t fs;
+	int ret;
 	(void)argc; (void)argv;
 
-	memset(&fs, 0, sizeof(fs));
+	memset(&defaults, 0, sizeof(defaults));
+	ret = fstree_init(&fs, &defaults);
+	TEST_EQUAL_I(ret, 0);
+
 	memset(&sb, 0, sizeof(sb));
 	sb.st_mode = S_IFDIR | 0654;
 	sb.st_uid = 123;
@@ -24,7 +29,9 @@ int main(int argc, char **argv)
 	sb.st_rdev = 789;
 	sb.st_size = 4096;
 
-	root = fstree_mknode(NULL, "rootdir", 7, NULL, &sb);
+	root = fstree_add_generic(&fs, "rootdir", &sb, NULL);
+	TEST_NOT_NULL(root);
+	TEST_ASSERT(root->parent == fs.root);
 	TEST_EQUAL_UI(root->uid, sb.st_uid);
 	TEST_EQUAL_UI(root->gid, sb.st_gid);
 	TEST_EQUAL_UI(root->mode, sb.st_mode);
@@ -32,19 +39,20 @@ int main(int argc, char **argv)
 	TEST_ASSERT(root->name >= (char *)root->payload);
 	TEST_STR_EQUAL(root->name, "rootdir");
 	TEST_NULL(root->data.children);
-	TEST_NULL(root->parent);
 	TEST_NULL(root->next);
 
-	a = fstree_mknode(root, "adir", 4, NULL, &sb);
+	a = fstree_add_generic(&fs, "rootdir/adir", &sb, NULL);
+	TEST_NOT_NULL(a);
 	TEST_ASSERT(a->parent == root);
 	TEST_NULL(a->next);
 	TEST_EQUAL_UI(a->link_count, 2);
 	TEST_EQUAL_UI(root->link_count, 3);
 	TEST_ASSERT(root->data.children == a);
-	TEST_NULL(root->parent);
+	TEST_ASSERT(root->parent == fs.root);
 	TEST_NULL(root->next);
 
-	b = fstree_mknode(root, "bdir", 4, NULL, &sb);
+	b = fstree_add_generic(&fs, "rootdir/bdir", &sb, NULL);
+	TEST_NOT_NULL(b);
 	TEST_ASSERT(a->parent == root);
 	TEST_ASSERT(b->parent == root);
 	TEST_EQUAL_UI(b->link_count, 2);
@@ -52,12 +60,9 @@ int main(int argc, char **argv)
 	TEST_ASSERT(a->next == b);
 	TEST_EQUAL_UI(root->link_count, 4);
 	TEST_NULL(b->next);
-	TEST_NULL(root->parent);
+	TEST_ASSERT(root->parent == fs.root);
 	TEST_NULL(root->next);
 
-	free(root);
-	free(a);
-	free(b);
-
+	fstree_cleanup(&fs);
 	return EXIT_SUCCESS;
 }