save

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

diff --git a/lib/ecoli_node_option.c b/lib/ecoli_node_option.c
index 4b52814..ab4f9f3 100644 (file)
--- a/lib/ecoli_node_option.c
+++ b/lib/ecoli_node_option.c
@@ -41,6 +41,8 @@
 #include <ecoli_node_str.h>
 #include <ecoli_test.h>
 
+EC_LOG_TYPE_REGISTER(node_option);
+
 struct ec_node_option {
        struct ec_node gen;
        struct ec_node *child;
@@ -55,22 +57,24 @@ ec_node_option_parse(const struct ec_node *gen_node,
        int ret;
 
        ret = ec_node_parse_child(node->child, state, strvec);
+       if (ret < 0)
+               return ret;
+
        if (ret == EC_PARSED_NOMATCH)
                return 0;
-       else if (ret < 0)
-               return ret;
 
        return ret;
 }
 
-static struct ec_completed *
+static int
 ec_node_option_complete(const struct ec_node *gen_node,
-                       struct ec_parsed *state,
+                       struct ec_completed *completed,
+                       struct ec_parsed *parsed,
                        const struct ec_strvec *strvec)
 {
        struct ec_node_option *node = (struct ec_node_option *)gen_node;
 
-       return ec_node_complete_child(node->child, state, strvec);
+       return ec_node_complete_child(node->child, completed, parsed, strvec);
 }
 
 static void ec_node_option_free_priv(struct ec_node *gen_node)
@@ -121,7 +125,7 @@ static int ec_node_option_testcase(void)
 
        node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_PARSE(node, 1, "foo");
@@ -133,21 +137,18 @@ static int ec_node_option_testcase(void)
        /* test completion */
        node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST,
-               "foo");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "f", EC_NODE_ENDLIST,
-               "oo", EC_NODE_ENDLIST,
-               "oo");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "b", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ec_node_free(node);
 
        return ret;