Skip to content

Commit 987c5d6

Browse files
michalvaskomichalvasko
committed
cmake UPDATE libyang updates
1 parent 837b06f commit 987c5d6

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINO
7171
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
7272

7373
# Version of libyang library that this project depends on
74-
set(LIBYANG_DEP_VERSION 5.1.0)
75-
set(LIBYANG_DEP_SOVERSION 5.1.0)
74+
set(LIBYANG_DEP_VERSION 5.1.1)
75+
set(LIBYANG_DEP_SOVERSION 5.1.1)
7676
set(LIBYANG_DEP_SOVERSION_MAJOR 5)
7777

7878
# global C flags

‎examples/server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ get_rpc(struct lyd_node *rpc, struct nc_session *session)
126126
}
127127

128128
/* create the get RPC anyxml "data" output node with the requested data */
129-
if (lyd_new_any(duplicate, NULL, "data", root, NULL, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
129+
if (lyd_new_any(duplicate, NULL, "data", root, NULL, 0, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
130130
err = nc_err(ctx, NC_ERR_OP_FAILED, NC_ERR_TYPE_APP);
131131
goto error;
132132
}

‎src/session_client.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2739,10 +2739,10 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
27392739
CHECK_LYRC_BREAK(lyd_new_term(cont, mod, ncds2str[rpc_gc->source], NULL, 0, NULL));
27402740
if (rpc_gc->filter) {
27412741
if (!rpc_gc->filter[0] || (rpc_gc->filter[0] == '<')) {
2742-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_gc->filter, 0, &node));
2742+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_gc->filter, 0, 0, &node));
27432743
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "subtree", 0, NULL));
27442744
} else {
2745-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, &node));
2745+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, 0, &node));
27462746
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "xpath", 0, NULL));
27472747
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:select", rpc_gc->filter, 0, NULL));
27482748
}
@@ -2776,7 +2776,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
27762776
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "error-option", rpcedit_erropt2str[rpc_e->error_opt], 0, NULL));
27772777
}
27782778
if (!rpc_e->edit_cont[0] || (rpc_e->edit_cont[0] == '<')) {
2779-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", NULL, rpc_e->edit_cont, 0, NULL));
2779+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", NULL, rpc_e->edit_cont, 0, 0, NULL));
27802780
} else {
27812781
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "url", rpc_e->edit_cont, 0, NULL));
27822782
}
@@ -2796,7 +2796,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
27962796
CHECK_LYRC_BREAK(lyd_new_inner(data, mod, "source", 0, &cont));
27972797
if (rpc_cp->url_config_src) {
27982798
if (!rpc_cp->url_config_src[0] || (rpc_cp->url_config_src[0] == '<')) {
2799-
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", NULL, rpc_cp->url_config_src, 0, NULL));
2799+
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", NULL, rpc_cp->url_config_src, 0, 0, NULL));
28002800
} else {
28012801
CHECK_LYRC_BREAK(lyd_new_term(cont, mod, "url", rpc_cp->url_config_src, 0, NULL));
28022802
}
@@ -2849,10 +2849,10 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
28492849
CHECK_LYRC_BREAK(lyd_new_inner(NULL, mod, "get", 0, &data));
28502850
if (rpc_g->filter) {
28512851
if (!rpc_g->filter[0] || (rpc_g->filter[0] == '<')) {
2852-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_g->filter, 0, &node));
2852+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_g->filter, 0, 0, &node));
28532853
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "subtree", 0, NULL));
28542854
} else {
2855-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, &node));
2855+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, 0, &node));
28562856
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "xpath", 0, NULL));
28572857
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:select", rpc_g->filter, 0, NULL));
28582858
}
@@ -2917,7 +2917,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
29172917
CHECK_LYRC_BREAK(lyd_new_inner(data, mod, "source", 0, &cont));
29182918
if (rpc_val->url_config_src) {
29192919
if (!rpc_val->url_config_src[0] || (rpc_val->url_config_src[0] == '<')) {
2920-
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", NULL, rpc_val->url_config_src, 0, NULL));
2920+
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", NULL, rpc_val->url_config_src, 0, 0, NULL));
29212921
} else {
29222922
CHECK_LYRC_BREAK(lyd_new_term(cont, mod, "url", rpc_val->url_config_src, 0, NULL));
29232923
}
@@ -2949,10 +2949,10 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
29492949

29502950
if (rpc_sub->filter) {
29512951
if (!rpc_sub->filter[0] || (rpc_sub->filter[0] == '<')) {
2952-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_sub->filter, 0, &node));
2952+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_sub->filter, 0, 0, &node));
29532953
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "subtree", 0, NULL));
29542954
} else {
2955-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, &node));
2955+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, 0, &node));
29562956
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "xpath", 0, NULL));
29572957
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:select", rpc_sub->filter, 0, NULL));
29582958
}
@@ -2973,7 +2973,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
29732973

29742974
if (rpc_getd->filter) {
29752975
if (!rpc_getd->filter[0] || (rpc_getd->filter[0] == '<')) {
2976-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "subtree-filter", NULL, rpc_getd->filter, 0, NULL));
2976+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "subtree-filter", NULL, rpc_getd->filter, 0, 0, NULL));
29772977
} else {
29782978
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "xpath-filter", rpc_getd->filter, 0, NULL));
29792979
}
@@ -3010,7 +3010,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30103010
NULL));
30113011
}
30123012
if (!rpc_editd->edit_cont[0] || (rpc_editd->edit_cont[0] == '<')) {
3013-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", NULL, rpc_editd->edit_cont, 0, NULL));
3013+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", NULL, rpc_editd->edit_cont, 0, 0, NULL));
30143014
} else {
30153015
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "url", rpc_editd->edit_cont, 0, NULL));
30163016
}
@@ -3023,7 +3023,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30233023

30243024
if (rpc_estsub->filter) {
30253025
if (!rpc_estsub->filter[0] || (rpc_estsub->filter[0] == '<')) {
3026-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", NULL, rpc_estsub->filter, 0, NULL));
3026+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", NULL, rpc_estsub->filter, 0, 0, NULL));
30273027
} else if (rpc_estsub->filter[0] == '/') {
30283028
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "stream-xpath-filter", rpc_estsub->filter, 0, NULL));
30293029
} else {
@@ -3053,7 +3053,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30533053

30543054
if (rpc_modsub->filter) {
30553055
if (!rpc_modsub->filter[0] || (rpc_modsub->filter[0] == '<')) {
3056-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", NULL, rpc_modsub->filter, 0, NULL));
3056+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", NULL, rpc_modsub->filter, 0, 0, NULL));
30573057
} else if (rpc_modsub->filter[0] == '/') {
30583058
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "stream-xpath-filter", rpc_modsub->filter, 0, NULL));
30593059
} else {
@@ -3091,7 +3091,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30913091

30923092
if (rpc_estpush->filter) {
30933093
if (!rpc_estpush->filter[0] || (rpc_estpush->filter[0] == '<')) {
3094-
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", NULL, rpc_estpush->filter, 0, NULL));
3094+
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", NULL, rpc_estpush->filter, 0, 0, NULL));
30953095
} else if (rpc_estpush->filter[0] == '/') {
30963096
CHECK_LYRC_BREAK(lyd_new_term(data, mod2, "datastore-xpath-filter", rpc_estpush->filter, 0, NULL));
30973097
} else {
@@ -3141,7 +3141,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
31413141

31423142
if (rpc_modpush->filter) {
31433143
if (!rpc_modpush->filter[0] || (rpc_modpush->filter[0] == '<')) {
3144-
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", NULL, rpc_modpush->filter, 0, NULL));
3144+
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", NULL, rpc_modpush->filter, 0, 0, NULL));
31453145
} else if (rpc_modpush->filter[0] == '/') {
31463146
CHECK_LYRC_BREAK(lyd_new_term(data, mod2, "datastore-xpath-filter", rpc_modpush->filter, 0, NULL));
31473147
} else {

‎src/session_server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ nc_clb_default_get_schema(struct lyd_node *rpc, struct nc_session *session)
904904
nc_err_set_msg(err, ly_last_logmsg(), "en");
905905
goto error;
906906
}
907-
if (lyd_new_any(data, NULL, "data", NULL, model_data, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
907+
if (lyd_new_any(data, NULL, "data", NULL, model_data, 0, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
908908
err = nc_err(session->ctx, NC_ERR_OP_FAILED, NC_ERR_TYPE_APP);
909909
nc_err_set_msg(err, ly_last_logmsg(), "en");
910910
goto error;

0 commit comments

Comments
 (0)