get node children and refs in the same function

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

diff --git a/lib/ecoli_node_re_lex.c b/lib/ecoli_node_re_lex.c
index e0acdfe..0120367 100644 (file)
--- a/lib/ecoli_node_re_lex.c
+++ b/lib/ecoli_node_re_lex.c
@@ -143,13 +143,13 @@ static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
        struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
        unsigned int i;
 
+       ec_node_free(node->child);
        for (i = 0; i < node->len; i++) {
                ec_free(node->table[i].pattern);
                regfree(&node->table[i].r);
        }
 
        ec_free(node->table);
-       ec_node_free(node->child);
 }
 
 static size_t
@@ -162,15 +162,18 @@ ec_node_re_lex_get_children_count(const struct ec_node *gen_node)
        return 0;
 }
 
-static struct ec_node *
-ec_node_re_lex_get_child(const struct ec_node *gen_node, size_t i)
+static int
+ec_node_re_lex_get_child(const struct ec_node *gen_node, size_t i,
+                       struct ec_node **child, unsigned int *refs)
 {
        struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
 
        if (i >= 1)
-               return NULL;
+               return -1;
 
-       return node->child;
+       *child = node->child;
+       *refs = 1;
+       return 0;
 }
 
 static struct ec_node_type ec_node_re_lex_type = {