X-Git-Url: http://git.droids-corp.org/?p=protos%2Flibecoli.git;a=blobdiff_plain;f=src%2Fecoli_node_dynamic.c;fp=src%2Fecoli_node_dynamic.c;h=2ce2e32c2d9d9246fd7edcb5404d41050bd23dd7;hp=e511f68167abab06e1e19a1a330ffa1ca74e81ff;hb=984760622f2c8472fd2667e24bcceb543bdb1aff;hpb=ae32f7f2fd1bc44a5388e1984f7c96bc29d3fdc2

diff --git a/src/ecoli_node_dynamic.c b/src/ecoli_node_dynamic.c
index e511f68..2ce2e32 100644
--- a/src/ecoli_node_dynamic.c
+++ b/src/ecoli_node_dynamic.c
@@ -30,7 +30,7 @@ struct ec_node_dynamic {
 
 static int
 ec_node_dynamic_parse(const struct ec_node *node,
-		struct ec_parse *parse,
+		struct ec_pnode *parse,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_dynamic *priv = ec_node_priv(node);
@@ -46,14 +46,14 @@ ec_node_dynamic_parse(const struct ec_node *node,
 	/* add the node pointer in the attributes, so it will be freed
 	 * when parse is freed */
 	snprintf(key, sizeof(key), "_dyn_%p", child);
-	ret = ec_dict_set(ec_parse_get_attrs(parse), key, child,
+	ret = ec_dict_set(ec_pnode_get_attrs(parse), key, child,
 			(void *)node_free);
 	if (ret < 0) {
 		child = NULL; /* already freed */
 		goto fail;
 	}
 
-	return ec_node_parse_child(child, parse, strvec);
+	return ec_parse_child(child, parse, strvec);
 
 fail:
 	ec_node_free(child);
@@ -66,7 +66,7 @@ ec_node_dynamic_complete(const struct ec_node *node,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_dynamic *priv = ec_node_priv(node);
-	struct ec_parse *parse;
+	struct ec_pnode *parse;
 	struct ec_node *child = NULL;
 	void (*node_free)(struct ec_node *) = ec_node_free;
 	char key[64];
@@ -87,7 +87,7 @@ ec_node_dynamic_complete(const struct ec_node *node,
 		goto fail;
 	}
 
-	return ec_node_complete_child(child, comp, strvec);
+	return ec_complete_child(child, comp, strvec);
 
 fail:
 	ec_node_free(child);
@@ -131,18 +131,18 @@ fail:
 EC_NODE_TYPE_REGISTER(ec_node_dynamic_type);
 
 static struct ec_node *
-build_counter(struct ec_parse *parse, void *opaque)
+build_counter(struct ec_pnode *parse, void *opaque)
 {
 	const struct ec_node *node;
-	struct ec_parse *root, *iter;
+	struct ec_pnode *root, *iter;
 	unsigned int count = 0;
 	char buf[32];
 
 	(void)opaque;
-	root = ec_parse_get_root(parse);
+	root = ec_pnode_get_root(parse);
 	for (iter = root; iter != NULL;
-	     iter = EC_PARSE_ITER_NEXT(root, iter, 1)) {
-		node = ec_parse_get_node(iter);
+	     iter = EC_PNODE_ITER_NEXT(root, iter, 1)) {
+		node = ec_pnode_get_node(iter);
 		if (!strcmp(ec_node_id(node), "my-id"))
 			count++;
 	}
@@ -171,11 +171,11 @@ static int ec_node_dynamic_testcase(void)
 	/* test completion */
 
 	testres |= EC_TEST_CHECK_COMPLETE(node,
-		"c", EC_NODE_ENDLIST,
-		"count-0", EC_NODE_ENDLIST);
+		"c", EC_VA_END,
+		"count-0", EC_VA_END);
 	testres |= EC_TEST_CHECK_COMPLETE(node,
-		"count-0", "", EC_NODE_ENDLIST,
-		"count-1", EC_NODE_ENDLIST,
+		"count-0", "", EC_VA_END,
+		"count-1", EC_VA_END,
 		"count-1");
 	ec_node_free(node);