X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_subset.c;h=059b7b97197e7c0fd4b3617fd294027b4297d3b4;hb=7c07e2a8b3b5851de0c238da830291f041185778;hp=cc3442b94f1306e9ebe5b15dfe3b8b7b8a98067b;hpb=044f2e33e83ec36df6601e3950820d07facde0a7;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_subset.c b/lib/ecoli_node_subset.c index cc3442b..059b7b9 100644 --- a/lib/ecoli_node_subset.c +++ b/lib/ecoli_node_subset.c @@ -234,19 +234,39 @@ ec_node_subset_complete(const struct ec_node *gen_node, static void ec_node_subset_free_priv(struct ec_node *gen_node) { struct ec_node_subset *node = (struct ec_node_subset *)gen_node; - unsigned int i; + size_t i; for (i = 0; i < node->len; i++) ec_node_free(node->table[i]); ec_free(node->table); } +static size_t +ec_node_subset_get_children_count(const struct ec_node *gen_node) +{ + struct ec_node_subset *node = (struct ec_node_subset *)gen_node; + return node->len; +} + +static struct ec_node * +ec_node_subset_get_child(const struct ec_node *gen_node, size_t i) +{ + struct ec_node_subset *node = (struct ec_node_subset *)gen_node; + + if (i >= node->len) + return NULL; + + return node->table[i]; +} + static struct ec_node_type ec_node_subset_type = { .name = "subset", .parse = ec_node_subset_parse, .complete = ec_node_subset_complete, .size = sizeof(struct ec_node_subset), .free_priv = ec_node_subset_free_priv, + .get_children_count = ec_node_subset_get_children_count, + .get_child = ec_node_subset_get_child, }; EC_NODE_TYPE_REGISTER(ec_node_subset_type); @@ -273,10 +293,6 @@ int ec_node_subset_add(struct ec_node *gen_node, struct ec_node *child) } node->table = table; - - if (ec_node_add_child(gen_node, child) < 0) - goto fail; - table[node->len] = child; node->len++;