commit 307f07706ff59617d637c311fe22384e0f5f1fbb
author aPiecek <piecek@cesnet.cz> Fri Sep 10 09:09:47 2021 +0200
committer Michal Vasko <mvasko@cesnet.cz> Wed Sep 22 09:54:46 2021 +0200
tree d4bd1b58f31912d8da5d099cfa4b700d554a58fb
parent 586b1d293e8bbd130900482e368852c2f8885323

lyb parser REFACTOR moved functions opaq, anydata

src/parser_lyb.c

diff --git a/src/parser_lyb.c b/src/parser_lyb.c
index 81b640a..ce5f73b 100644
--- a/src/parser_lyb.c
+++ b/src/parser_lyb.c
@@ -1223,53 +1223,43 @@
     uint32_t flags;
     const struct ly_ctx *ctx = lybctx->lybctx->ctx;
 
-    if (!snode) {
-        ret = lyb_parse_node_opaq(lybctx, parent, first_p, parsed);
-        LY_CHECK_GOTO(ret, cleanup);
-    } else if (snode->nodetype & LYD_NODE_TERM) {
-        /* read necessary basic data */
-        ret = lyb_parse_node_header(lybctx, &flags, &meta);
-        LY_CHECK_GOTO(ret, cleanup);
+    /* read necessary basic data */
+    ret = lyb_parse_node_header(lybctx, &flags, &meta);
+    LY_CHECK_GOTO(ret, error);
 
+    if (snode->nodetype & LYD_NODE_TERM) {
         /* read value of term node and create it */
         ret = lyb_create_term(lybctx, snode, &node);
-        LY_CHECK_GOTO(ret, cleanup);
-
-        lyb_finish_node(lybctx, parent, flags, &meta, &node, first_p, parsed);
+        LY_CHECK_GOTO(ret, error);
     } else if (snode->nodetype & LYD_NODE_INNER) {
-        /* read necessary basic data */
-        ret = lyb_parse_node_header(lybctx, &flags, &meta);
-        LY_CHECK_GOTO(ret, cleanup);
-
         /* create node */
         ret = lyd_create_inner(snode, &node);
-        LY_CHECK_GOTO(ret, cleanup);
+        LY_CHECK_GOTO(ret, error);
 
         /* process children */
         ret = lyb_parse_siblings(lybctx, node, NULL, NULL);
-        LY_CHECK_GOTO(ret, cleanup);
+        LY_CHECK_GOTO(ret, error);
 
         /* additional procedure for inner node */
         ret = lyb_validate_node_inner(lybctx, snode, node);
-        LY_CHECK_GOTO(ret, cleanup);
+        LY_CHECK_GOTO(ret, error);
 
         if (snode->nodetype & (LYS_RPC | LYS_ACTION | LYS_NOTIF)) {
             /* rememeber the RPC/action/notification */
             lybctx->op_node = node;
         }
-
-        /* register parsed node */
-        lyb_finish_node(lybctx, parent, flags, &meta, &node, first_p, parsed);
-    } else if (snode->nodetype & LYD_NODE_ANY) {
-        ret = lyb_parse_node_any(lybctx, parent, snode, first_p, parsed);
-        LY_CHECK_GOTO(ret, cleanup);
     } else {
         LOGINT(ctx);
         ret = LY_EINT;
-        goto cleanup;
+        goto error;
     }
 
-cleanup:
+    /* register parsed node */
+    lyb_finish_node(lybctx, parent, flags, &meta, &node, first_p, parsed);
+
+    return LY_SUCCESS;
+
+error:
     lyd_free_meta_siblings(meta);
     lyd_free_tree(node);
     return ret;
@@ -1318,7 +1308,13 @@
         }
         LY_CHECK_RET(ret);
 
-        lyb_parse_node(lybctx, parent, snode, first_p, parsed);
+        if (!snode) {
+            ret = lyb_parse_node_opaq(lybctx, parent, first_p, parsed);
+        } else if (snode->nodetype & LYD_NODE_ANY) {
+            ret = lyb_parse_node_any(lybctx, parent, snode, first_p, parsed);
+        } else {
+            ret = lyb_parse_node(lybctx, parent, snode, first_p, parsed);
+        }
         LY_CHECK_RET(ret);
 
         if (top_level && !(lybctx->int_opts & LYD_INTOPT_WITH_SIBLINGS)) {