cmake UPDATE libyang updates

Author: michalvasko

CMakeLists.txt

@@ -44,8 +44,8 @@ endif()
 set(NP2SRV_VERSION 2.6.2)
 
 # libyang required version
-set(LIBYANG_DEP_VERSION 4.0.0)
-set(LIBYANG_DEP_SOVERSION 4.0.0)
+set(LIBYANG_DEP_VERSION 4.2.0)
+set(LIBYANG_DEP_SOVERSION 4.2.0)
 set(LIBYANG_DEP_SOVERSION_MAJOR 4)
 
 # libnetconf2 required version

cli/commands.c

@@ -227,7 +227,7 @@ cli_ntf_clb(struct nc_session *UNUSED(session), const struct lyd_node *envp, con
     for (top = op; top->parent; top = lyd_parent(top)) {}
 
     fprintf(output, "notification (%s)\n", ((struct lyd_node_opaq *)lyd_child(envp))->value);
-    lyd_print_file(output, top, opts.output_format, LYD_PRINT_WITHSIBLINGS | opts.output_flag);
+    lyd_print_file(output, top, opts.output_format, LYD_PRINT_SIBLINGS | opts.output_flag);
     fprintf(output, "\n");
     fflush(output);
 
@@ -364,7 +364,7 @@ cli_send_recv(struct nc_rpc *rpc, FILE *output, NC_WD_MODE wd_mode, int timeout_
                 fputs(any->value.str, output);
                 break;
             case LYD_ANYDATA_DATATREE:
-                lyd_print_mem(&model_data, any->value.tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
+                lyd_print_mem(&model_data, any->value.tree, LYD_XML, LYD_PRINT_SIBLINGS);
                 fputs(model_data, output);
                 free(model_data);
                 break;
@@ -402,7 +402,7 @@ cli_send_recv(struct nc_rpc *rpc, FILE *output, NC_WD_MODE wd_mode, int timeout_
                 break;
             }
 
-            lyd_print_file(output, lyd_child(op), opts.output_format, LYD_PRINT_WITHSIBLINGS | ly_wd | opts.output_flag);
+            lyd_print_file(output, lyd_child(op), opts.output_format, LYD_PRINT_SIBLINGS | ly_wd | opts.output_flag);
             if (output == stdout) {
                 fprintf(output, "\n");
             }
@@ -443,7 +443,7 @@ cli_send_recv(struct nc_rpc *rpc, FILE *output, NC_WD_MODE wd_mode, int timeout_
             info = lyd_child(err);
             while (!lyd_find_sibling_opaq_next(info, "error-info", &info)) {
                 fprintf(output, "\tinfo:\n");
-                lyd_print_file(stdout, lyd_child(info), LYD_XML, LYD_PRINT_WITHSIBLINGS);
+                lyd_print_file(stdout, lyd_child(info), LYD_XML, LYD_PRINT_SIBLINGS);
 
                 info = info->next;
             }

src/netconf.c

@@ -435,7 +435,7 @@ np2srv_rpc_copyconfig_cb(const struct lyd_node *rpc, struct np_user_sess *user_s
             }
         }
 
-        if ((reply = np_op_export_url(LYD_CTX(rpc), trg_url, config, LYD_PRINT_WITHSIBLINGS | lyp_wd_flag))) {
+        if ((reply = np_op_export_url(LYD_CTX(rpc), trg_url, config, LYD_PRINT_SIBLINGS | lyp_wd_flag))) {
             goto cleanup;
         }
     } else

src/netconf_confirmed_commit.c

@@ -591,7 +591,7 @@ ncc_backup_module(sr_session_ctx_t *session, const struct lys_module *module)
         reply = np_reply_err_op_failed(session, NULL, "Memory allocation failed.");
         goto cleanup;
     }
-    if (lyd_print_path(path, data ? data->tree : NULL, LYD_JSON, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK)) {
+    if (lyd_print_path(path, data ? data->tree : NULL, LYD_JSON, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK)) {
         ERR("Failed backing up node of module \"%s\" into file \"%s\".", module->name, path);
         reply = np_reply_err_op_failed(session, NULL, ly_last_logmsg());
         goto cleanup;

tests/np2_test.h

@@ -141,7 +141,7 @@ struct np2_test {
     if (err_tag) { \
         assert_string_equal(lyd_get_value(lyd_child(lyd_child(st->envp))->next), err_tag); \
     } else { \
-        assert_int_equal(LY_SUCCESS, lyd_print_mem(&state->str, lyd_child(state->envp), LYD_XML, LYD_PRINT_WITHSIBLINGS)); \
+        assert_int_equal(LY_SUCCESS, lyd_print_mem(&state->str, lyd_child(state->envp), LYD_XML, LYD_PRINT_SIBLINGS)); \
     }
 
 #define ASSERT_ERROR_REPLY(state) \