fix config dump

[protos/libecoli.git] / lib / ecoli_node_or.c

diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c
index 67047b3..bbb8ad5 100644 (file)
--- a/lib/ecoli_node_or.c
+++ b/lib/ecoli_node_or.c
@@ -68,7 +68,10 @@ ec_node_or_complete(const struct ec_node *gen_node,
 static void ec_node_or_free_priv(struct ec_node *gen_node)
 {
        struct ec_node_or *node = (struct ec_node_or *)gen_node;
+       size_t i;
 
+       for (i = 0; i < node->len; i++)
+               ec_node_free(node->table[i]);
        ec_free(node->table);
 }
 
@@ -79,15 +82,18 @@ ec_node_or_get_children_count(const struct ec_node *gen_node)
        return node->len;
 }
 
-static struct ec_node *
-ec_node_or_get_child(const struct ec_node *gen_node, size_t i)
+static int
+ec_node_or_get_child(const struct ec_node *gen_node, size_t i,
+               struct ec_node **child, unsigned int *refs)
 {
        struct ec_node_or *node = (struct ec_node_or *)gen_node;
 
        if (i >= node->len)
-               return NULL;
+               return -1;
 
-       return node->table[i];
+       *child = node->table[i];
+       *refs = 1;
+       return 0;
 }
 
 static struct ec_node_type ec_node_or_type = {
@@ -144,7 +150,7 @@ struct ec_node *__ec_node_or(const char *id, ...)
 
        va_start(ap, id);
 
-       gen_node = __ec_node(&ec_node_or_type, id);
+       gen_node = ec_node_from_type(&ec_node_or_type, id);
        node = (struct ec_node_or *)gen_node;
        if (node == NULL)
                fail = 1;;