cleanups and such

4 files changed, 46 insertions, 15 deletions

diff --git a/obcl/main.c b/obcl/main.c
index 5fb83967..9ae109a9 100644
--- a/obcl/main.c
+++ b/obcl/main.c
@@ -3,6 +3,7 @@
 int main()
 {
     GList *lst = cl_parse("foo.conf");
-    cl_print_tree(lst,0);
+    cl_tree_print(lst,0);
+    cl_tree_free(lst);
     return 0;
 }
diff --git a/obcl/obcl.c b/obcl/obcl.c
index b4d9aeee..a4b58eec 100644
--- a/obcl/obcl.c
+++ b/obcl/obcl.c
@@ -1,22 +1,49 @@
 #include "obcl.h"
 
-void free_cl_tree(GList *tree)
+void cl_tree_free(GList *tree)
 {
+    CLNode *tmp;
+
+    if (!tree) return;
 
+    for (; tree; tree = tree->next) {
+        tmp = (CLNode*)tree->data;
+        switch(tmp->type) {
+        case CL_ID:
+        case CL_STR:
+            g_free(tmp->u.str);
+            break;
+        case CL_LIST:
+        case CL_BLOCK:
+        case CL_LISTBLOCK:
+            g_free(tmp->u.lb.id);
+            cl_tree_free(tmp->u.lb.list);
+            cl_tree_free(tmp->u.lb.block);
+            break;
+        default:
+            break;
+        }
+        g_free(tmp);
+    }
+    g_list_free(tree);
 }
 
 GList *cl_parse(gchar *file)
 {
     FILE *fh = fopen(file, "r");
-    if (fh)
-        return cl_parse_fh(fh);
-    else {
-        printf("can't open file %s\n", file);
-        return 0;
+    GList *ret = NULL;
+
+    if (fh) {
+        ret = cl_parse_fh(fh);
+        fclose(fh);
+    } else {
+        perror(file);
     }
+
+    return ret;
 }
 
-void cl_print_tree(GList *tree, int depth)
+void cl_tree_print(GList *tree, int depth)
 {
     CLNode *tmp;
     int tmpd = depth;
@@ -40,17 +67,17 @@ void cl_print_tree(GList *tree, int depth)
             break;
         case CL_LIST:
             printf("--LIST-- %s\n", tmp->u.lb.id);
-            cl_print_tree(tmp->u.lb.list, depth+2);
+            cl_tree_print(tmp->u.lb.list, depth+2);
             break;
         case CL_BLOCK:
             printf("--BLOCK-- %s\n", tmp->u.lb.id);
-            cl_print_tree(tmp->u.lb.block, depth+2);
+            cl_tree_print(tmp->u.lb.block, depth+2);
             break;
         case CL_LISTBLOCK:
             printf("--LISTBLOCK-- %s\n", tmp->u.lb.id);
-            cl_print_tree(tmp->u.lb.list, depth+2);
+            cl_tree_print(tmp->u.lb.list, depth+2);
             printf("\n");
-            cl_print_tree(tmp->u.lb.block, depth+2);
+            cl_tree_print(tmp->u.lb.block, depth+2);
             break;
         }
     }
diff --git a/obcl/obcl.h b/obcl/obcl.h
index a940e89d..1002964d 100644
--- a/obcl/obcl.h
+++ b/obcl/obcl.h
@@ -28,11 +28,12 @@ typedef struct CLNode {
 
 } CLNode;
 
-void free_cl_tree(GList *tree);
 GList *cl_parse(gchar *file);
 GList *cl_parse_fh(FILE *file);
-void cl_print_tree(GList *tree, int depth);
 
-GList *parse_file(FILE *fh);
+void cl_tree_free(GList *tree);
+void cl_tree_print(GList *tree, int depth);
+
+void cl_tree_process(GList *tree);
 
 #endif /* __obcl_h */
diff --git a/obcl/parse.y b/obcl/parse.y
index 40a07181..f060bcec 100644
--- a/obcl/parse.y
+++ b/obcl/parse.y
@@ -51,6 +51,7 @@ stmt: TOK_ID list ';'
         CLNode *s = g_new(CLNode,1);
         s->type = CL_LIST;
         s->u.lb.list = $2;
+        s->u.lb.block = NULL;
         s->u.lb.id = $1;
         $$ = s;
     }
@@ -68,6 +69,7 @@ stmt: TOK_ID list ';'
         CLNode *s = g_new(CLNode,1);
         s->type = CL_BLOCK;
         s->u.lb.block = $2;
+        s->u.lb.list = NULL;
         s->u.lb.id = $1;
         $$ = s;
     }