diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-05 01:25:43 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-05 01:26:06 +0200 |
commit | 7ce4b36d517ac5fade36240d293ff784ef6a9305 (patch) | |
tree | f0c246595251d27f62010aca770b25bb5f7ea336 /lib/fstree/test/mknode_reg.c | |
parent | 7a39921d7fff089c87ac183d3c0d6e42e5cbaa04 (diff) |
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>
Diffstat (limited to 'lib/fstree/test/mknode_reg.c')
-rw-r--r-- | lib/fstree/test/mknode_reg.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/fstree/test/mknode_reg.c b/lib/fstree/test/mknode_reg.c index 368720f..3dc6eb3 100644 --- a/lib/fstree/test/mknode_reg.c +++ b/lib/fstree/test/mknode_reg.c @@ -11,12 +11,16 @@ 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_IFREG | 0654; @@ -25,18 +29,19 @@ int main(int argc, char **argv) sb.st_rdev = 789; sb.st_size = 4096; - node = fstree_mknode(NULL, "filename", 8, "input", &sb); + node = fstree_add_generic(&fs, "filename", &sb, "input"); + 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, sb.st_mode); - TEST_NULL(node->parent); TEST_EQUAL_UI(node->link_count, 1); TEST_ASSERT((char *)node->name >= (char *)node->payload); TEST_ASSERT(node->data.file.input_file >= (char *)node->payload); TEST_ASSERT(node->data.file.input_file >= node->name + 8); TEST_STR_EQUAL(node->name, "filename"); TEST_STR_EQUAL(node->data.file.input_file, "input"); - free(node); + fstree_cleanup(&fs); return EXIT_SUCCESS; } |