commit 420cc255e3b7e90b660dd2abcc7d2fe2dd86bf42
author Michal Vasko <mvasko@cesnet.cz> Thu Aug 24 08:14:24 2023 +0200
committer Michal Vasko <mvasko@cesnet.cz> Thu Aug 24 08:14:24 2023 +0200
tree 7584f33b6635e3f0ae45fb7e8c219112ac567be9
parent 2ef4226dc0580034bd40e8f405e9f884873eeb86

tree data BUGFIX lyd_owner_module behavior now consistent

It is meant to return the owner module for both
data and opaque nodes. For node modules there
is a new function now.

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index 4f5bffb..1c1056b 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -4502,7 +4502,7 @@
 xpath_name(struct lyxp_set **args, uint32_t arg_count, struct lyxp_set *set, uint32_t options)
 {
     struct lyxp_set_node *item;
-    struct lys_module *mod = NULL;
+    const struct lys_module *mod = NULL;
     char *str;
     const char *name = NULL;
 
@@ -4548,8 +4548,8 @@
         /* keep NULL */
         break;
     case LYXP_NODE_ELEM:
-        mod = item->node->schema->module;
-        name = item->node->schema->name;
+        mod = lyd_node_module(item->node);
+        name = LYD_NAME(item->node);
         break;
     case LYXP_NODE_META:
         mod = ((struct lyd_meta *)item->node)->annotation->module;
@@ -4584,7 +4584,7 @@
 xpath_namespace_uri(struct lyxp_set **args, uint32_t arg_count, struct lyxp_set *set, uint32_t options)
 {
     struct lyxp_set_node *item;
-    struct lys_module *mod;
+    const struct lys_module *mod;
 
     /* suppress unused variable warning */
     (void)options;
@@ -4634,7 +4634,7 @@
     case LYXP_NODE_ELEM:
     case LYXP_NODE_META:
         if (item->type == LYXP_NODE_ELEM) {
-            mod = item->node->schema->module;
+            mod = lyd_node_module(item->node);
         } else { /* LYXP_NODE_META */
             /* annotations */
             mod = ((struct lyd_meta *)item->node)->annotation->module;