rename structures and functions

[protos/libecoli.git] / src / ecoli_node_option.c

diff --git a/src/ecoli_node_option.c b/src/ecoli_node_option.c
index f2f8977..85f3451 100644 (file)
--- a/src/ecoli_node_option.c
+++ b/src/ecoli_node_option.c
@@ -28,13 +28,13 @@ struct ec_node_option {
 
 static int
 ec_node_option_parse(const struct ec_node *node,
-               struct ec_parse *state,
+               struct ec_pnode *state,
                const struct ec_strvec *strvec)
 {
        struct ec_node_option *priv = ec_node_priv(node);
        int ret;
 
-       ret = ec_node_parse_child(priv->child, state, strvec);
+       ret = ec_parse_child(priv->child, state, strvec);
        if (ret < 0)
                return ret;
 
@@ -51,7 +51,7 @@ ec_node_option_complete(const struct ec_node *node,
 {
        struct ec_node_option *priv = ec_node_priv(node);
 
-       return ec_node_complete_child(priv->child, comp, strvec);
+       return ec_complete_child(priv->child, comp, strvec);
 }
 
 static void ec_node_option_free_priv(struct ec_node *node)
@@ -216,14 +216,14 @@ static int ec_node_option_testcase(void)
                return -1;
        }
        testres |= EC_TEST_CHECK_COMPLETE(node,
-               "", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST);
+               "", EC_VA_END,
+               "foo", EC_VA_END);
        testres |= EC_TEST_CHECK_COMPLETE(node,
-               "f", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST);
+               "f", EC_VA_END,
+               "foo", EC_VA_END);
        testres |= EC_TEST_CHECK_COMPLETE(node,
-               "b", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST);
+               "b", EC_VA_END,
+               EC_VA_END);
        ec_node_free(node);
 
        return testres;