static void ec_node_cmd_free_priv(struct ec_node *gen_node)
{
struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
+ size_t i;
ec_free(node->cmd_str);
- ec_node_free(node->cmd);
ec_node_free(node->expr);
ec_node_free(node->parser);
+ for (i = 0; i < node->len; i++)
+ ec_node_free(node->table[i]);
ec_free(node->table);
}
struct ec_node *cmd = NULL;
struct ec_node **table = NULL;
char *cmd_str = NULL;
- size_t n;
+ size_t n, i;
/* retrieve config locally */
expr = ec_config_dict_get(config, "expr");
n = 0;
TAILQ_FOREACH(child, &children->list, next) {
- table[n] = child->node;
+ table[n] = ec_node_clone(child->node);
n++;
}
node->cmd = cmd;
ec_free(node->cmd_str);
node->cmd_str = cmd_str;
+ for (i = 0; i < node->len; i++)
+ ec_node_free(node->table[i]);
ec_free(node->table);
node->table = table;
node->len = n;
return 0;
fail:
+ if (table != NULL) {
+ for (i = 0; i < n; i++)
+ ec_node_free(table[i]);
+ }
ec_free(table);
ec_free(cmd_str);
ec_node_free(cmd);
ec_node_cmd_get_children_count(const struct ec_node *gen_node)
{
struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
- return node->len;
+
+ if (node->cmd == NULL)
+ return 0;
+ return 1;
}
static struct ec_node *
{
struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
- if (i >= node->len)
+ if (i > 0)
return NULL;
- return node->table[i];
+ return node->cmd;
}
static struct ec_node_type ec_node_cmd_type = {
struct ec_node_cmd *node = NULL;
struct ec_node *child;
va_list ap;
+ int ret;
va_start(ap, cmd);
child = va_arg(ap, struct ec_node *);
}
children = NULL;
- if (ec_node_set_config(gen_node, config) < 0)
+ ret = ec_node_set_config(gen_node, config);
+ config = NULL; /* freed */
+ if (ret < 0)
goto fail;
va_end(ap);
ec_node_free(child);
fail:
ec_node_free(gen_node); /* will also free added children */
+ ec_config_free(children);
ec_config_free(config);
va_end(ap);
ec_node_int("x", 0, 10, 10),
ec_node_int("y", 20, 30, 10)
);
- ec_node_free(node);
- return 0;
-
if (node == NULL) {
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;