X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_subset.c;h=bfd7e71187156d3588dac84ce8fed712a18b7abe;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=62a28719272f18466693f3af7f17aea2a7bd463c;hpb=8df9723e4c3a2bb0ba89a8f5a70c319c7702935f;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_subset.c b/lib/ecoli_node_subset.c
index 62a2871..bfd7e71 100644
--- a/lib/ecoli_node_subset.c
+++ b/lib/ecoli_node_subset.c
@@ -54,10 +54,8 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table,
 	memset(&best_result, 0, sizeof(best_result));
 
 	child_table = ec_calloc(table_len - 1, sizeof(*child_table));
-	if (child_table == NULL) {
-		ret = -ENOMEM;
+	if (child_table == NULL)
 		goto fail;
-	}
 
 	for (i = 0; i < table_len; i++) {
 		/* try to parse elt i */
@@ -80,10 +78,8 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table,
 		len = ret;
 		childvec = ec_strvec_ndup(strvec, len,
 					ec_strvec_len(strvec) - len);
-		if (childvec == NULL) {
-			ret = -ENOMEM;
+		if (childvec == NULL)
 			goto fail;
-		}
 
 		memset(&result, 0, sizeof(result));
 		ret = __ec_node_subset_parse(&result, child_table,
@@ -122,7 +118,7 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table,
 	ec_parse_free(best_parse);
 	ec_strvec_free(childvec);
 	ec_free(child_table);
-	return ret;
+	return -1;
 }
 
 static int
@@ -238,19 +234,42 @@ 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 int
+ec_node_subset_get_child(const struct ec_node *gen_node, size_t i,
+			struct ec_node **child, unsigned int *refs)
+{
+	struct ec_node_subset *node = (struct ec_node_subset *)gen_node;
+
+	if (i >= node->len)
+		return -1;
+
+	*child = node->table[i];
+	*refs = 1;
+	return 0;
+}
+
 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);
@@ -277,10 +296,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++;