remove max parse len

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

diff --git a/lib/ecoli_node.c b/lib/ecoli_node.c
index dd4ed68..f8c6c02 100644 (file)
--- a/lib/ecoli_node.c
+++ b/lib/ecoli_node.c
@@ -27,16 +27,20 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <ecoli_malloc.h>
+#include <ecoli_string.h>
 #include <ecoli_strvec.h>
 #include <ecoli_keyval.h>
 #include <ecoli_log.h>
 #include <ecoli_node.h>
 
+EC_LOG_TYPE_REGISTER(node);
+
 static struct ec_node_type_list node_type_list =
        TAILQ_HEAD_INITIALIZER(node_type_list);
 
@@ -75,38 +79,47 @@ void ec_node_type_dump(FILE *out)
 struct ec_node *__ec_node(const struct ec_node_type *type, const char *id)
 {
        struct ec_node *node = NULL;
-       char buf[256]; // XXX
 
-       ec_log(EC_LOG_DEBUG, "create node type=%s id=%s\n",
+       EC_LOG(EC_LOG_DEBUG, "create node type=%s id=%s\n",
                type->name, id);
+       if (id == NULL) {
+               errno = EINVAL;
+               goto fail;
+       }
 
        node = ec_calloc(1, type->size);
        if (node == NULL)
                goto fail;
 
-       TAILQ_INIT(&node->children);
        node->type = type;
        node->refcnt = 1;
 
-       if (id != NULL) {
-               node->id = ec_strdup(id);
-               if (node->id == NULL)
-                       goto fail;
-       }
+       node->id = ec_strdup(id);
+       if (node->id == NULL)
+               goto fail;
 
-       snprintf(buf, sizeof(buf), "<%s>", type->name);
-       node->desc = ec_strdup(buf); // XXX ec_asprintf ?
-       if (node->desc == NULL)
+       if (ec_asprintf(&node->desc, "<%s>", type->name) < 0)
                goto fail;
 
        node->attrs = ec_keyval();
        if (node->attrs == NULL)
                goto fail;
 
+       if (type->init_priv != NULL) {
+               if (type->init_priv(node) < 0)
+                       goto fail;
+       }
+
        return node;
 
  fail:
-       ec_node_free(node);
+       if (node != NULL) {
+               ec_keyval_free(node->attrs);
+               ec_free(node->desc);
+               ec_free(node->id);
+       }
+       ec_free(node);
+
        return NULL;
 }
 
@@ -116,7 +129,8 @@ struct ec_node *ec_node(const char *typename, const char *id)
 
        type = ec_node_type_lookup(typename);
        if (type == NULL) {
-               ec_log(EC_LOG_ERR, "type=%s does not exist\n", typename);
+               EC_LOG(EC_LOG_ERR, "type=%s does not exist\n",
+                       typename);
                return NULL;
        }
 
@@ -135,6 +149,7 @@ void ec_node_free(struct ec_node *node)
 
        if (node->type != NULL && node->type->free_priv != NULL)
                node->type->free_priv(node);
+       ec_free(node->children);
        ec_free(node->id);
        ec_free(node->desc);
        ec_free(node->attrs);
@@ -148,15 +163,79 @@ struct ec_node *ec_node_clone(struct ec_node *node)
        return node;
 }
 
+size_t ec_node_get_children_count(const struct ec_node *node)
+{
+       return node->n_children;
+}
+
+struct ec_node *
+ec_node_get_child(const struct ec_node *node, size_t i)
+{
+       if (i >= ec_node_get_children_count(node))
+               return NULL;
+       return node->children[i];
+}
+
+int ec_node_add_child(struct ec_node *node, struct ec_node *child)
+{
+       struct ec_node **children = NULL;
+       size_t n;
+
+       if (node == NULL || child == NULL) {
+               errno = EINVAL;
+               goto fail;
+       }
+
+       n = node->n_children;
+       children = ec_realloc(node->children,
+                       (n + 1) * sizeof(child));
+       if (children == NULL)
+               goto fail;
+
+       children[n] = child;
+       node->children = children;
+       node->n_children = n + 1;
+
+       return 0;
+
+fail:
+       ec_free(children);
+       return -1;
+}
+
+int ec_node_del_child(struct ec_node *node, struct ec_node *child)
+{
+       size_t i, n;
+
+       if (node == NULL || child == NULL)
+               goto fail;
+
+       n = node->n_children;
+       for (i = 0; i < n; i++) {
+               if (node->children[i] != child)
+                       continue;
+               memcpy(&node->children[i], &node->children[i+1],
+                       (n - i - 1) * sizeof(child));
+               return 0;
+       }
+
+fail:
+       errno = EINVAL;
+       return -1;
+}
+
 struct ec_node *ec_node_find(struct ec_node *node, const char *id)
 {
        struct ec_node *child, *ret;
        const char *node_id = ec_node_id(node);
+       size_t i, n;
 
        if (id != NULL && node_id != NULL && !strcmp(node_id, id))
                return node;
 
-       TAILQ_FOREACH(child, &node->children, next) {
+       n = node->n_children;
+       for (i = 0; i < n; i++) {
+               child = node->children[i];
                ret = ec_node_find(child, id);
                if (ret != NULL)
                        return ret;
@@ -177,17 +256,12 @@ const char *ec_node_id(const struct ec_node *node)
        return node->id;
 }
 
-struct ec_node *ec_node_parent(const struct ec_node *node)
-{
-       return node->parent;
-}
-
 static void __ec_node_dump(FILE *out,
        const struct ec_node *node, size_t indent)
 {
        const char *id, *typename, *desc;
        struct ec_node *child;
-       size_t i;
+       size_t i, n;
 
        id = ec_node_id(node);
        typename = node->type->name;
@@ -201,10 +275,13 @@ static void __ec_node_dump(FILE *out,
                        fprintf(out, "|");
        }
 
-       fprintf(out, "node %p type=%s id=%s desc=%s\n",
+       fprintf(out, "node %p type=%s id=%s desc=%s ",
                node, typename, id, desc);
-       TAILQ_FOREACH(child, &node->children, next)
+       n = node->n_children;
+       for (i = 0; i < n; i++) {
+               child = node->children[i];
                __ec_node_dump(out, child, indent + 2);
+       }
 }
 
 void ec_node_dump(FILE *out, const struct ec_node *node)
@@ -226,3 +303,13 @@ const char *ec_node_desc(const struct ec_node *node)
 
        return node->desc;
 }
+
+int ec_node_check_type(const struct ec_node *node,
+               const struct ec_node_type *type)
+{
+       if (strcmp(node->type->name, type->name)) {
+               errno = EINVAL;
+               return -1;
+       }
+       return 0;
+}