commit 7d05125adb9b1737c89401a70ee40340507b59f0
author Michal Vasko <mvasko@cesnet.cz> Wed Mar 16 13:16:29 2016 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Mar 16 13:16:29 2016 +0100
tree df520972c5b0885830d484ae778efad3e9c9c520
parent 1fcc1c4221cb9ecd01fa9f6da05d1d8e58f093ae

data tree REFACTOR lyd_new* separated into 2 functions

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index 524e46f..572f42e 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -175,10 +175,32 @@
     return ret;
 }
 
+static struct lyd_node *
+_lyd_new(struct lyd_node *parent, const struct lys_node *schema)
+{
+    struct lyd_node *ret;
+
+    ret = calloc(1, sizeof *ret);
+    if (!ret) {
+        LOGMEM;
+        return NULL;
+    }
+    ret->schema = (struct lys_node *)schema;
+    ret->validity = LYD_VAL_NOT;
+    ret->prev = ret;
+    if (parent) {
+        if (lyd_insert(parent, ret)) {
+            lyd_free(ret);
+            return NULL;
+        }
+    }
+
+    return ret;
+}
+
 API struct lyd_node *
 lyd_new(struct lyd_node *parent, const struct lys_module *module, const char *name)
 {
-    struct lyd_node *ret;
     const struct lys_node *snode = NULL, *siblings;
 
     if ((!parent && !module) || !name) {
@@ -200,22 +222,7 @@
         return NULL;
     }
 
-    ret = calloc(1, sizeof *ret);
-    if (!ret) {
-        LOGMEM;
-        return NULL;
-    }
-    ret->schema = (struct lys_node *)snode;
-    ret->validity = LYD_VAL_NOT;
-    ret->prev = ret;
-    if (parent) {
-        if (lyd_insert(parent, ret)) {
-            lyd_free(ret);
-            return NULL;
-        }
-    }
-
-    return ret;
+    return _lyd_new(parent, snode);
 }
 
 static struct lyd_node *
@@ -244,33 +251,12 @@
     return (struct lyd_node *)ret;
 }
 
-API struct lyd_node *
-lyd_new_leaf(struct lyd_node *parent, const struct lys_module *module, const char *name, const char *val_str)
+static struct lyd_node *
+_lyd_new_leaf(struct lyd_node *parent, const struct lys_node *schema, const char *val_str)
 {
     struct lyd_node *ret;
-    const struct lys_node *snode = NULL, *siblings;
 
-    if ((!parent && !module) || !name) {
-        ly_errno = LY_EINVAL;
-        return NULL;
-    }
-
-    if (!parent) {
-        siblings = module->data;
-    } else {
-        if (!parent->schema) {
-            ly_errno = LY_EINVAL;
-            return NULL;
-        }
-        siblings = parent->schema->child;
-    }
-
-    if (lys_get_data_sibling(module, siblings, name, LYS_LEAFLIST | LYS_LEAF, &snode) || !snode) {
-        ly_errno = LY_EINVAL;
-        return NULL;
-    }
-
-    ret = lyd_create_leaf(snode, val_str);
+    ret = lyd_create_leaf(schema, val_str);
     if (!ret) {
         return NULL;
     }
@@ -294,6 +280,34 @@
     }
 
     return ret;
+}
+
+API struct lyd_node *
+lyd_new_leaf(struct lyd_node *parent, const struct lys_module *module, const char *name, const char *val_str)
+{
+    const struct lys_node *snode = NULL, *siblings;
+
+    if ((!parent && !module) || !name) {
+        ly_errno = LY_EINVAL;
+        return NULL;
+    }
+
+    if (!parent) {
+        siblings = module->data;
+    } else {
+        if (!parent->schema) {
+            ly_errno = LY_EINVAL;
+            return NULL;
+        }
+        siblings = parent->schema->child;
+    }
+
+    if (lys_get_data_sibling(module, siblings, name, LYS_LEAFLIST | LYS_LEAF, &snode) || !snode) {
+        ly_errno = LY_EINVAL;
+        return NULL;
+    }
+
+    return _lyd_new_leaf(parent, snode, val_str);
 
 }
 
@@ -368,10 +382,30 @@
     return (struct lyd_node *)ret;
 }
 
+static struct lyd_node *
+_lyd_new_anyxml(struct lyd_node *parent, const struct lys_node *schema, const char *val_xml)
+{
+    struct lyd_node *ret;
+
+    ret = lyd_create_anyxml(schema, val_xml);
+    if (!ret) {
+        return NULL;
+    }
+
+    /* connect to parent */
+    if (parent) {
+        if (lyd_insert(parent, ret)) {
+            lyd_free(ret);
+            return NULL;
+        }
+    }
+
+    return ret;
+}
+
 API struct lyd_node *
 lyd_new_anyxml(struct lyd_node *parent, const struct lys_module *module, const char *name, const char *val_xml)
 {
-    struct lyd_node *ret;
     const struct lys_node *siblings, *snode;
 
     if ((!parent && !module) || !name) {
@@ -392,20 +426,7 @@
         return NULL;
     }
 
-    ret = lyd_create_anyxml(snode, val_xml);
-    if (!ret) {
-        return NULL;
-    }
-
-    /* connect to parent */
-    if (parent) {
-        if (lyd_insert(parent, ret)) {
-            lyd_free(ret);
-            return NULL;
-        }
-    }
-
-    return ret;
+    return _lyd_new_anyxml(parent, snode, val_xml);
 }
 
 API struct lyd_node *