diff --git a/cv7/program.c b/cv7/program.c index 523b003..d43bea1 100644 --- a/cv7/program.c +++ b/cv7/program.c @@ -20,15 +20,16 @@ struct tree* read_tree(){ return node; } -struct tstruct tree* load_tree() { - struct tree* tree = read_tree(); - - tree->left = load_tree(); - tree->right = load_tree(); - - if (tree->value[0] == "*"){ - re +struct tree* load_tree() { + struct tree* node = read_tree(); + if (!node) { + return NULL; } + if (node->value[0] != '*') { + node->left = load_tree(); + node->right = load_tree(); + } + return node; } void print_tree(struct tree* tree,int offset){ @@ -61,11 +62,3 @@ void count_items(struct tree* tree, int* count){ } } -int main() { - printf("Constructing the tree:\n"); - struct tree* root = test(); - printf("The tree structure:\n"); - print_tree(root, 0); - - return 0; -}