tests more consistent

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

diff --git a/lib/ecoli_node_option.c b/lib/ecoli_node_option.c
index 3f79754..76fb676 100644 (file)
--- a/lib/ecoli_node_option.c
+++ b/lib/ecoli_node_option.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <assert.h>
 #include <stdarg.h>
+#include <errno.h>
 
 #include <ecoli_malloc.h>
 #include <ecoli_log.h>
@@ -37,9 +38,9 @@
 #include <ecoli_node.h>
 #include <ecoli_parsed.h>
 #include <ecoli_completed.h>
-#include <ecoli_node_option.h>
 #include <ecoli_node_str.h>
 #include <ecoli_test.h>
+#include <ecoli_node_option.h>
 
 EC_LOG_TYPE_REGISTER(node_option);
 
@@ -93,64 +94,86 @@ static struct ec_node_type ec_node_option_type = {
 
 EC_NODE_TYPE_REGISTER(ec_node_option_type);
 
+int ec_node_option_set(struct ec_node *gen_node, struct ec_node *child)
+{
+       struct ec_node_option *node = (struct ec_node_option *)gen_node;
+
+       if (gen_node == NULL || child == NULL) {
+               errno = EINVAL;
+               goto fail;
+       }
+
+       if (ec_node_check_type(gen_node, &ec_node_option_type) < 0)
+               goto fail;
+
+       if (ec_node_add_child(gen_node, child) < 0)
+               goto fail;
+
+       node->child = child;
+
+       return 0;
+
+fail:
+       ec_node_free(child);
+       return -1;
+}
+
 struct ec_node *ec_node_option(const char *id, struct ec_node *child)
 {
        struct ec_node *gen_node = NULL;
-       struct ec_node_option *node = NULL;
 
        if (child == NULL)
-               return NULL;
+               goto fail;
 
        gen_node = __ec_node(&ec_node_option_type, id);
-       if (gen_node == NULL) {
-               ec_node_free(child);
-               return NULL;
-       }
-       node = (struct ec_node_option *)gen_node;
+       if (gen_node == NULL)
+               goto fail;
 
-       node->child = child;
+       ec_node_option_set(gen_node, child);
+       child = NULL;
 
-       child->parent = gen_node;
-       TAILQ_INSERT_TAIL(&gen_node->children, child, next);
+       return gen_node;
 
-       return &node->gen;
+fail:
+       ec_node_free(child);
+       return NULL;
 }
 
 /* LCOV_EXCL_START */
 static int ec_node_option_testcase(void)
 {
        struct ec_node *node;
-       int ret = 0;
+       int testres = 0;
 
-       node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
+       node = ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"));
        if (node == NULL) {
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "foo");
-       ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
-       ret |= EC_TEST_CHECK_PARSE(node, 0, "bar");
-       ret |= EC_TEST_CHECK_PARSE(node, 0);
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "foo");
+       testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
+       testres |= EC_TEST_CHECK_PARSE(node, 0, "bar");
+       testres |= EC_TEST_CHECK_PARSE(node, 0);
        ec_node_free(node);
 
        /* test completion */
-       node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
+       node = ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"));
        if (node == NULL) {
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
                "foo", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "f", EC_NODE_ENDLIST,
                "foo", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "b", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST);
        ec_node_free(node);
 
-       return ret;
+       return testres;
 }
 /* LCOV_EXCL_STOP */