tree data BUGFIX dup inst search with mounted data

Author: michalvasko

src/diff.c

@@ -985,7 +985,7 @@ lyd_diff_find_match(const struct lyd_node *siblings, const struct lyd_node *targ
     }
 
     /* update match as needed */
-    LY_CHECK_RET(lyd_dup_inst_next(match, siblings, dup_inst_ht));
+    LY_CHECK_RET(lyd_dup_inst_next(match, dup_inst_ht));
 
     if (*match && ((*match)->flags & LYD_DEFAULT) && !defaults) {
         /* ignore default nodes */

src/tree_data.c

@@ -2724,7 +2724,7 @@ lyd_merge_sibling_r(struct lyd_node **first_trg, struct lyd_node *parent_trg,
 
     if (match_trg) {
         /* update match as needed */
-        LY_CHECK_RET(lyd_dup_inst_next(&match_trg, *first_trg, dup_inst));
+        LY_CHECK_RET(lyd_dup_inst_next(&match_trg, dup_inst));
     } else {
         /* first instance of this node */
         first_inst = 1;
@@ -2821,7 +2821,7 @@ lyd_merge_sibling_r(struct lyd_node **first_trg, struct lyd_node *parent_trg,
 
         if (first_inst) {
             /* remember not to find this instance next time */
-            LY_CHECK_RET(lyd_dup_inst_next(&dup_src, *first_trg, dup_inst));
+            LY_CHECK_RET(lyd_dup_inst_next(&dup_src, dup_inst));
         }
 
         /* call callback, no source node */

src/tree_data_common.c

@@ -105,7 +105,7 @@ lyd_dup_inst_get(const struct lyd_node *first_inst, struct ly_ht **dup_inst_ht)
 }
 
 LY_ERR
-lyd_dup_inst_next(struct lyd_node **inst, const struct lyd_node *siblings, struct ly_ht **dup_inst_ht)
+lyd_dup_inst_next(struct lyd_node **inst, struct ly_ht **dup_inst_ht)
 {
     struct lyd_dup_inst *dup_inst;
 
@@ -117,11 +117,11 @@ lyd_dup_inst_next(struct lyd_node **inst, const struct lyd_node *siblings, struc
     /* there can be more exact same instances (even if not allowed in invalid data) and we must make sure we do not
      * match a single node more times */
     dup_inst = lyd_dup_inst_get(*inst, dup_inst_ht);
-    LY_CHECK_ERR_RET(!dup_inst, LOGMEM(LYD_CTX(siblings)), LY_EMEM);
+    LY_CHECK_ERR_RET(!dup_inst, LOGMEM(LYD_CTX(*inst)), LY_EMEM);
 
     if (!dup_inst->used) {
-        /* we did not cache these instances yet, do so */
-        lyd_find_sibling_dup_inst_set(siblings, *inst, &dup_inst->set);
+        /* we did not cache these instances yet, do so (use the same inst in case it is from a mount-point) */
+        lyd_find_sibling_dup_inst_set(*inst, *inst, &dup_inst->set);
         assert(dup_inst->set->count && (dup_inst->set->dnodes[0] == *inst));
     }
 

src/tree_data_internal.h

@@ -47,11 +47,10 @@ struct lyd_dup_inst {
  * (that should not be considered next time) instance.
  *
  * @param[in,out] inst Found instance, is updated so that the same instance is not returned twice.
- * @param[in] siblings Siblings where @p inst was found.
  * @param[in] dup_inst_ht Duplicate instance cache hash table.
  * @return LY_ERR value.
  */
-LY_ERR lyd_dup_inst_next(struct lyd_node **inst, const struct lyd_node *siblings, struct ly_ht **dup_inst_ht);
+LY_ERR lyd_dup_inst_next(struct lyd_node **inst, struct ly_ht **dup_inst_ht);
 
 /**
  * @brief Free duplicate instance cache.