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 --- tests/mknode_dir.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/mknode_dir.c') diff --git a/tests/mknode_dir.c b/tests/mknode_dir.c index 2ca189d..3b6aeda 100644 --- a/tests/mknode_dir.c +++ b/tests/mknode_dir.c @@ -26,29 +26,28 @@ int main(void) sb.st_rdev = 789; sb.st_size = 4096; - root = fstree_mknode(NULL, "rootdir", 7, (void *)0x100, &sb); + root = fstree_mknode(NULL, "rootdir", 7, NULL, &sb); assert(root->uid == sb.st_uid); assert(root->gid == sb.st_gid); assert(root->mode == sb.st_mode); assert((char *)root->name >= (char *)root->payload); - assert((char *)root->data.dir >= (char *)root->payload); - assert(root->name >= (char *)(root->data.dir + 1)); + assert(root->name >= (char *)root->payload); assert(strcmp(root->name, "rootdir") == 0); - assert(root->data.dir->children == NULL); + assert(root->data.dir.children == NULL); assert(root->parent == NULL); assert(root->next == NULL); - a = fstree_mknode(root, "adir", 4, (void *)0x100, &sb); + a = fstree_mknode(root, "adir", 4, NULL, &sb); assert(a->parent == root); assert(a->next == NULL); - assert(root->data.dir->children == a); + assert(root->data.dir.children == a); assert(root->parent == NULL); assert(root->next == NULL); - b = fstree_mknode(root, "bdir", 4, (void *)0x100, &sb); + b = fstree_mknode(root, "bdir", 4, NULL, &sb); assert(a->parent == root); assert(b->parent == root); - assert(root->data.dir->children == b); + assert(root->data.dir.children == b); assert(b->next == a); assert(a->next == NULL); assert(root->parent == NULL); -- cgit v1.2.3