/* count the number of occurences of the node: if already parsed,
* do not match
*/
- count = count_node(ec_parsed_get_root(parsed), node->child); //XXX
+ count = count_node(ec_parsed_get_root(parsed), node->child);
if (count > 0)
return 0;
int ec_node_once_set(struct ec_node *gen_node, struct ec_node *child)
{
struct ec_node_once *node = (struct ec_node_once *)gen_node;
- int ret;
- if (gen_node == NULL || child == NULL)
- return -EINVAL;
+ if (gen_node == NULL || child == NULL) {
+ errno = EINVAL;
+ goto fail;
+ }
- ret = ec_node_check_type(gen_node, &ec_node_once_type);
- if (ret < 0)
- return ret;
+ if (ec_node_check_type(gen_node, &ec_node_once_type) < 0)
+ goto fail;
- node->child = child;
+ if (ec_node_add_child(gen_node, child) < 0)
+ goto fail;
- child->parent = gen_node;
- TAILQ_INSERT_TAIL(&gen_node->children, child, next); // XXX really needed?
+ node->child = child;
return 0;
+
+fail:
+ ec_node_free(child);
+ return -1;
}
struct ec_node *ec_node_once(const char *id, struct ec_node *child)
gen_node = __ec_node(&ec_node_once_type, id);
if (gen_node == NULL)
- return NULL;
+ goto fail;
ec_node_once_set(gen_node, child);
+ child = NULL;
return gen_node;
+
+fail:
+ ec_node_free(child);
+ return NULL;
}
/* LCOV_EXCL_START */
static int ec_node_once_testcase(void)
{
struct ec_node *node;
- int ret = 0;
+ int testres = 0;
node = ec_node_many(EC_NO_ID,
EC_NODE_OR(EC_NO_ID,
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
}
- ret |= EC_TEST_CHECK_PARSE(node, 0);
- ret |= EC_TEST_CHECK_PARSE(node, 1, "foo");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "bar");
- ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar");
- ret |= EC_TEST_CHECK_PARSE(node, 3, "foo", "bar", "bar");
- ret |= EC_TEST_CHECK_PARSE(node, 3, "bar", "foo", "bar");
- ret |= EC_TEST_CHECK_PARSE(node, 2, "bar", "foo", "foo");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "foo");
- ret |= EC_TEST_CHECK_PARSE(node, 0, "foox");
-
- ec_node_free(node);
-
-#if 0 //XXX no completion test for node_once
- /* test completion */
- node = EC_NODE_OR(EC_NO_ID,
- ec_node_str(EC_NO_ID, "foo"),
- ec_node_str(EC_NO_ID, "bar"),
- ec_node_str(EC_NO_ID, "bar2"),
- ec_node_str(EC_NO_ID, "toto"),
- ec_node_str(EC_NO_ID, "titi")
- );
- if (node == NULL) {
- EC_LOG(EC_LOG_ERR, "cannot create node\n");
- return -1;
- }
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_PARSE(node, 0);
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 3, "foo", "bar", "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 3, "bar", "foo", "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 2, "bar", "foo", "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 0, "foox");
+
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"", EC_NODE_ENDLIST,
- "foo", "bar", "bar2", "toto", "titi", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "bar", EC_NODE_ENDLIST);
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"f", EC_NODE_ENDLIST,
"foo", EC_NODE_ENDLIST);
+ testres |= EC_TEST_CHECK_COMPLETE(node,
+ "b", EC_NODE_ENDLIST,
+ "bar", EC_NODE_ENDLIST);
+ testres |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "", EC_NODE_ENDLIST,
+ "bar", EC_NODE_ENDLIST);
+ testres |= EC_TEST_CHECK_COMPLETE(node,
+ "bar", "", EC_NODE_ENDLIST,
+ "foo", "bar", EC_NODE_ENDLIST);
ec_node_free(node);
-#endif
- return ret;
+
+ return testres;
}
/* LCOV_EXCL_STOP */