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 <david.oberhollenzer@sigma-star.at>

1 files changed, 3 insertions, 4 deletions

diff --git a/tests/mknode_reg.c b/tests/mknode_reg.c
index b9c81e0..9d5267f 100644
--- a/tests/mknode_reg.c
+++ b/tests/mknode_reg.c
@@ -34,11 +34,10 @@ int main(void)
 	assert(node->mode == sb.st_mode);
 	assert(node->parent == NULL);
 	assert((char *)node->name >= (char *)node->payload);
-	assert((char *)node->data.file >= (char *)node->payload);
-	assert(node->data.file->input_file >= (char *)(node->data.file + 1));
-	assert(node->name >= node->data.file->input_file + 6);
+	assert(node->data.file.input_file >= (char *)node->payload);
+	assert(node->data.file.input_file >= node->name + 8);
 	assert(strcmp(node->name, "filename") == 0);
-	assert(strcmp(node->data.file->input_file, "input") == 0);
+	assert(strcmp(node->data.file.input_file, "input") == 0);
 	free(node);
 
 	return EXIT_SUCCESS;