From 1e97f0d76e2f2dd981d28c3c8f10b54fea394896 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Thu, 6 Aug 2020 15:29:02 +0200 Subject: reformat code --- tree.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tree.c') diff --git a/tree.c b/tree.c index 95702a2..8d4efe9 100644 --- a/tree.c +++ b/tree.c @@ -45,7 +45,8 @@ tree_insert(struct tree_node *tree, T key) if ( tree != NULL ) { tree->key = key; tree->count = 1; - tree->left = tree->right = NULL; + tree->left = NULL; + tree->right = NULL; } else ERROR("out of memory"); @@ -223,6 +224,12 @@ tree_count(struct tree_node *tree) return 0; } +bool +tree_isleaf(struct tree_node *tree) +{ + return tree->left == NULL && tree->right == NULL; +} + void tree_apply_preorder(struct tree_node *tree, void (*visit)(T key, void *cl), void *cl) { @@ -461,9 +468,8 @@ tree_apply_postorder_it(struct tree_node *tree, void (*visit)(T key, void *cl), struct tree_node *next = stack_peek(&stack); bool finishedSubtrees = (next->left == tree || next->right == tree); - bool isLeaf = (next->left == NULL && next->right == NULL); - if ( finishedSubtrees || isLeaf ) { + if ( finishedSubtrees || tree_isleaf(next) ) { stack_pop(&stack, &next); visit(next->key, cl); @@ -637,13 +643,11 @@ main(void) tree = tree_insert_it(tree, 15); tree = tree_insert_it(tree, 18); -#if 0 tree_apply_preorder(tree, print, NULL); puts("postorder:"); tree_apply_postorder(tree, print, NULL); puts("postorder_it:"); tree_apply_postorder_it(tree, print, NULL); -#endif show_tree(tree, 0, 0); puts("levelorder_it:"); -- cgit v1.3