Initializacia

cv7/program.c

@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <stdlib.h>
 
 #define SIZE 100
@@ -13,23 +12,19 @@ struct tree {
 
 struct tree* read_tree() {
     char buffer[SIZE];
+    memset(buffer, 0, SIZE);
 
-    while (fgets(buffer, SIZE, stdin)) {
-        buffer[strcspn(buffer, "\n")] = 0; 
-        
-        if (buffer[0] == '\0') {
-            continue; 
-        }
-        
-        struct tree* node = calloc(1, sizeof(struct tree));
-        strncpy(node->value, buffer, SIZE - 1);
-        return node;
-    }
-    
+    if (!fgets(buffer, SIZE, stdin) || buffer[0] == '\n') {
         return NULL;
     }
 
+    buffer[strcspn(buffer, "\n")] = 0;
 
+    struct tree* node = (struct tree*)calloc(1, sizeof(struct tree));
+    strncpy(node->value, buffer, SIZE - 1);
+
+    return node;
+}
 
 struct tree* load_tree() {
     struct tree* node = read_tree();
@@ -40,25 +35,18 @@ struct tree* load_tree() {
     if (node->value[0] != '*') {
         node->left = load_tree();
         node->right = load_tree();
-    } else { 
-        node->left = NULL;
-        node->right = NULL;
     }
     
     return node;
 }
 
-
-
-
-
 void run_tree(struct tree* tree) {
     if (!tree) {
         return;
     }
 
     if (tree->value[0] == '*') {
-        printf("*%s\nKoniec\n", tree->value + 1);
+        printf("%s\nKoniec\n", tree->value + 1);
         return;
     }
 
@@ -81,16 +69,20 @@ void run_tree(struct tree* tree) {
 }
 
 void destroy_tree(struct tree* tree) {
-    if (tree->left != NULL) {
+    if (!tree) {
+        return;
+    }
+    
     destroy_tree(tree->left);
-    }
-    if (tree->right != NULL) {
     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 {
@@ -101,6 +93,7 @@ void count_items(struct tree* tree, int* count) {
 
 int main() {
     struct tree* root = load_tree();
+
     printf("Expert z bufetu to vie.\n");
 
     if (!root) {
@@ -114,8 +107,7 @@ int main() {
     printf("Odpovedajte 'a' pre prvu moznost alebo 'n' pre druhu moznost.\n");
 
     run_tree(root);
+
     destroy_tree(root);
     return 0;
 }
-
-