Initializacia

cv7/program.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include <stdlib.h>
 
 #define SIZE 100
@@ -10,8 +11,6 @@ struct tree {
     struct tree* right;
 };
 
-int error_flag = 0;
-
 struct tree* read_tree() {
     char buffer[SIZE];
     memset(buffer, 0, SIZE);
@@ -20,7 +19,6 @@ struct tree* read_tree() {
         return NULL;
     }
     buffer[strcspn(buffer, "\n")] = 0;
-    
     struct tree* node = calloc(1, sizeof(struct tree));
     strncpy(node->value, buffer, SIZE - 1);
     return node;
@@ -29,18 +27,15 @@ struct tree* read_tree() {
 struct tree* load_tree() {
     struct tree* node = read_tree();
     if (!node) {
-        error_flag = 1;
         return NULL;
     }
     if (node->value[0] != '*') {
         node->left = load_tree();
-        if (error_flag) return node;
         node->right = load_tree();
     }
     return node;
 }
 
-
 void run_tree(struct tree* tree) {
     if (!tree) {
         return;
@@ -57,12 +52,11 @@ void run_tree(struct tree* tree) {
     if (scanf(" %c", &response) != 1) {
         printf("Koniec vstupu\n");
         return;
-    }else if (response != 'a' && response != 'n') {
+    } else if (response != 'a' && response != 'n') {
         printf("Nerozumiem\n");
         return;
     }
 
-
     if (response == 'a') {
         run_tree(tree->left);
     } else {
@@ -71,18 +65,16 @@ void run_tree(struct tree* tree) {
 }
 
 void destroy_tree(struct tree* tree) {
-    if (!tree) {
-        return;
+    if (tree->left != NULL) {
+        destroy_tree(tree->left);
+    }
+    if (tree->right != NULL) {
+        destroy_tree(tree->right);
     }
-    destroy_tree(tree->left);
-    destroy_tree(tree->right);
     free(tree);
 }
 
 void count_items(struct tree* tree, int* count) {
-    if (!tree) {
-        return;
-    }
     if (tree->left == NULL && tree->right == NULL) {
         (*count)++;
     } else {
@@ -94,9 +86,8 @@ void count_items(struct tree* tree, int* count) {
 int main() {
     struct tree* root = load_tree();
     printf("Expert z bufetu to vie.\n");
-    if (!root || error_flag) {
+    if (!root) {
         printf("Chybna databaza\n");
-        destroy_tree(root);
         return 0;
     }
 
@@ -106,7 +97,7 @@ int main() {
     printf("Odpovedajte 'a' pre prvu moznost alebo 'n' pre druhu moznost.\n");
 
     run_tree(root);
+
     destroy_tree(root);
     return 0;
 }
-