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, 15 insertions, 9 deletions

diff --git a/lib/fstree/test/mknode_slink.c b/lib/fstree/test/mknode_slink.c
index c50a0ba..d741746 100644
--- a/lib/fstree/test/mknode_slink.c
+++ b/lib/fstree/test/mknode_slink.c
@@ -11,12 +11,17 @@
 
 int main(int argc, char **argv)
 {
+	fstree_defaults_t defaults;
 	tree_node_t *node;
 	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_IFLNK | 0654;
 	sb.st_uid = 123;
@@ -24,31 +29,32 @@ int main(int argc, char **argv)
 	sb.st_rdev = 789;
 	sb.st_size = 1337;
 
-	node = fstree_mknode(NULL, "symlink", 7, "target", &sb);
+	node = fstree_add_generic(&fs, "/symlink", &sb, "target");
+	TEST_NOT_NULL(node);
+	TEST_ASSERT(node->parent == fs.root);
 	TEST_EQUAL_UI(node->uid, sb.st_uid);
 	TEST_EQUAL_UI(node->gid, sb.st_gid);
 	TEST_EQUAL_UI(node->mode, S_IFLNK | 0777);
 	TEST_EQUAL_UI(node->link_count, 1);
-	TEST_NULL(node->parent);
 	TEST_ASSERT((char *)node->name >= (char *)node->payload);
 	TEST_ASSERT(node->data.target >= (char *)node->payload);
 	TEST_ASSERT(node->data.target >= node->name + 8);
 	TEST_STR_EQUAL(node->name, "symlink");
 	TEST_STR_EQUAL(node->data.target, "target");
-	free(node);
 
-	node = fstree_mknode(NULL, "symlink", 7, "", &sb);
+	node = fstree_add_generic(&fs, "/foo", &sb, "");
+	TEST_NOT_NULL(node);
+	TEST_ASSERT(node->parent == fs.root);
 	TEST_EQUAL_UI(node->uid, sb.st_uid);
 	TEST_EQUAL_UI(node->gid, sb.st_gid);
 	TEST_EQUAL_UI(node->mode, S_IFLNK | 0777);
 	TEST_EQUAL_UI(node->link_count, 1);
-	TEST_NULL(node->parent);
 	TEST_ASSERT((char *)node->name >= (char *)node->payload);
 	TEST_ASSERT(node->data.target >= (char *)node->payload);
-	TEST_ASSERT(node->data.target >= node->name + 8);
-	TEST_STR_EQUAL(node->name, "symlink");
+	TEST_ASSERT(node->data.target >= node->name + 3);
+	TEST_STR_EQUAL(node->name, "foo");
 	TEST_STR_EQUAL(node->data.target, "");
-	free(node);
 
+	fstree_cleanup(&fs);
 	return EXIT_SUCCESS;
 }