commit b7be7a83d47c6a349b4d12b92950d6744fc15fc8
author Michal Vasko <mvasko@cesnet.cz> Thu Aug 20 09:09:04 2020 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Aug 20 11:58:33 2020 +0200
tree 37bb71ebee4284c031f3610cfb230fa6044f92e5
parent ba99a3ec231db4e45500136de12713717f54e81d

libyang REFACTOR unify lyd_node macros

LYD_CANONICAL -> LYD_CANON_VALUE
LYD_NODE_CTX -> LYD_CTX

src/parser_xml.c

diff --git a/src/parser_xml.c b/src/parser_xml.c
index 2e2180a..3bf8de0 100644
--- a/src/parser_xml.c
+++ b/src/parser_xml.c
@@ -976,7 +976,7 @@
     struct lyd_node *rpcr_e = NULL, *tree, *req_op, *rep_op = NULL;
 
     /* init */
-    LY_CHECK_GOTO(ret = lyxml_ctx_new(LYD_NODE_CTX(request), in, &lydctx.xmlctx), cleanup);
+    LY_CHECK_GOTO(ret = lyxml_ctx_new(LYD_CTX(request), in, &lydctx.xmlctx), cleanup);
     lydctx.parse_options = LYD_PARSE_ONLY | LYD_PARSE_STRICT;
     lydctx.int_opts = LYD_INTOPT_REPLY;
 
@@ -988,7 +988,7 @@
         LYD_TREE_DFS_END(request, req_op);
     }
     if (!(req_op->schema->nodetype & (LYS_RPC | LYS_ACTION))) {
-        LOGERR(LYD_NODE_CTX(request), LY_EINVAL, "No RPC/action in the request found.");
+        LOGERR(LYD_CTX(request), LY_EINVAL, "No RPC/action in the request found.");
         ret = LY_EINVAL;
         goto cleanup;
     }
@@ -1010,7 +1010,7 @@
     if (rpcr_e) {
         if (lydctx.xmlctx->status != LYXML_ELEM_CLOSE) {
             assert(lydctx.xmlctx->status == LYXML_ELEMENT);
-            LOGVAL(LYD_NODE_CTX(request), LY_VLOG_LINE, &lydctx.xmlctx->line, LYVE_SYNTAX,
+            LOGVAL(LYD_CTX(request), LY_VLOG_LINE, &lydctx.xmlctx->line, LYVE_SYNTAX,
                    "Unexpected sibling element \"%.*s\" of \"rpc-reply\".", lydctx.xmlctx->name_len, lydctx.xmlctx->name);
             ret = LY_EVALID;
             goto cleanup;