commit 1d87a9248f5b8ac00b3a5e359e01a00a2a8c75f1
author Michal Vasko <mvasko@cesnet.cz> Fri Aug 21 12:57:16 2015 +0200
committer Michal Vasko <mvasko@cesnet.cz> Fri Aug 21 12:57:16 2015 +0200
tree 4b89d4f60dd1864a54f885f615b736a28cd851b8
parent 67cffff7298f3dfef6daa902fc511a63c0a3ce9e

schema tree CHANGE augment got module pointer to fit better lys_node

src/resolve.c

diff --git a/src/resolve.c b/src/resolve.c
index 8f15f41..e0a4a18 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -2745,26 +2745,26 @@
  *
  * @param[in] aug Augment to use.
  * @param[in] siblings Nodes where to start the search in.
- * @param[in] module Main module.
  *
  * @return EXIT_SUCCESS on success, EXIT_FAILURE on forward reference, -1 on error.
  */
 int
-resolve_augment(struct lys_node_augment *aug, struct lys_node *siblings, struct lys_module *module)
+resolve_augment(struct lys_node_augment *aug, struct lys_node *siblings)
 {
     int rc;
-    struct lys_node *sub, *aux;
+    struct lys_node *sub;
 
-    assert(module);
+    assert(aug);
 
     /* resolve target node */
-    rc = resolve_schema_nodeid(aug->target_name, siblings, module, LYS_AUGMENT, &aug->target);
+    rc = resolve_schema_nodeid(aug->target_name, siblings, aug->module, LYS_AUGMENT, &aug->target);
     if (rc) {
         return rc;
     }
 
     if (!aug->child) {
         /* nothing to do */
+        LOGWRN("Augment \"%s\" without children.", aug->target_name);
         return EXIT_SUCCESS;
     }
 
@@ -2777,17 +2777,17 @@
     }
 
     /* check identifier uniquness as in lys_node_addchild() */
-    LY_TREE_FOR(aug->child, aux) {
-        if (lys_check_id(aux, aug->parent, module)) {
+    LY_TREE_FOR(aug->child, sub) {
+        if (lys_check_id(sub, aug->parent, aug->module)) {
             return -1;
         }
     }
     /* reconnect augmenting data into the target - add them to the target child list */
     if (aug->target->child) {
-        aux = aug->target->child->prev; /* remember current target's last node */
-        aux->next = aug->child;         /* connect augmenting data after target's last node */
+        sub = aug->target->child->prev; /* remember current target's last node */
+        sub->next = aug->child;         /* connect augmenting data after target's last node */
         aug->target->child->prev = aug->child->prev; /* new target's last node is last augmenting node */
-        aug->child->prev = aux;         /* finish connecting of both child lists */
+        aug->child->prev = sub;         /* finish connecting of both child lists */
     } else {
         aug->target->child = aug->child;
     }
@@ -2945,7 +2945,7 @@
 
     /* apply augments */
     for (i = 0; i < uses->augment_size; i++) {
-        rc = resolve_augment(&uses->augment[i], uses->child, uses->module);
+        rc = resolve_augment(&uses->augment[i], uses->child);
         if (rc) {
             LOGVAL(LYE_INRESOLV, line, "augment", uses->augment[i].target_name);
             return rc;