From 7ce4b36d517ac5fade36240d293ff784ef6a9305 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 5 May 2023 01:25:43 +0200 Subject: 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 --- lib/fstree/test/fstree_sort.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/fstree/test/fstree_sort.c') diff --git a/lib/fstree/test/fstree_sort.c b/lib/fstree/test/fstree_sort.c index fc44899..135976d 100644 --- a/lib/fstree/test/fstree_sort.c +++ b/lib/fstree/test/fstree_sort.c @@ -28,25 +28,25 @@ int main(int argc, char **argv) ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); - a = fstree_mknode(fs.root, "a", 1, NULL, &sb); + a = fstree_add_generic(&fs, "a", &sb, NULL); TEST_NOT_NULL(a); TEST_ASSERT(fs.root->data.children == a); TEST_NULL(a->next); - b = fstree_mknode(fs.root, "b", 1, NULL, &sb); + b = fstree_add_generic(&fs, "b", &sb, NULL); TEST_NOT_NULL(a); TEST_ASSERT(fs.root->data.children == a); TEST_ASSERT(a->next == b); TEST_NULL(b->next); - c = fstree_mknode(fs.root, "c", 1, NULL, &sb); + c = fstree_add_generic(&fs, "c", &sb, NULL); TEST_NOT_NULL(c); TEST_ASSERT(fs.root->data.children == a); TEST_ASSERT(a->next == b); TEST_ASSERT(b->next == c); TEST_NULL(c->next); - d = fstree_mknode(fs.root, "d", 1, NULL, &sb); + d = fstree_add_generic(&fs, "d", &sb, NULL); TEST_NOT_NULL(d); TEST_ASSERT(fs.root->data.children == a); TEST_ASSERT(a->next == b); @@ -60,25 +60,25 @@ int main(int argc, char **argv) ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); - d = fstree_mknode(fs.root, "d", 1, NULL, &sb); + d = fstree_add_generic(&fs, "d", &sb, NULL); TEST_NOT_NULL(d); TEST_ASSERT(fs.root->data.children == d); TEST_NULL(d->next); - c = fstree_mknode(fs.root, "c", 1, NULL, &sb); + c = fstree_add_generic(&fs, "c", &sb, NULL); TEST_NOT_NULL(c); TEST_ASSERT(fs.root->data.children == c); TEST_ASSERT(c->next == d); TEST_NULL(d->next); - b = fstree_mknode(fs.root, "b", 1, NULL, &sb); + b = fstree_add_generic(&fs, "b", &sb, NULL); TEST_NOT_NULL(b); TEST_ASSERT(fs.root->data.children == b); TEST_ASSERT(b->next == c); TEST_ASSERT(c->next == d); TEST_NULL(d->next); - a = fstree_mknode(fs.root, "a", 1, NULL, &sb); + a = fstree_add_generic(&fs, "a", &sb, NULL); TEST_NOT_NULL(a); TEST_ASSERT(fs.root->data.children == a); TEST_ASSERT(a->next == b); -- cgit v1.2.3