Skip to content

Commit dca5a77

Browse files
michalvaskomichalvasko
committed
cmake UPDATE libyang changes
1 parent e410854 commit dca5a77

18 files changed

+199
-199
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}
6868
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
6969

7070
# Version of libyang library that this sysrepo depends on
71-
set(LIBYANG_DEP_VERSION 4.0.0)
72-
set(LIBYANG_DEP_SOVERSION 4.0.0)
71+
set(LIBYANG_DEP_VERSION 4.2.0)
72+
set(LIBYANG_DEP_SOVERSION 4.2.0)
7373
set(LIBYANG_DEP_SOVERSION_MAJOR 4)
7474

7575
# generate only version header, it is needed for docs

‎examples/oper_pull_push_example.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ main(void)
9393

9494
/* print data */
9595
if (data) {
96-
lyd_print_file(stdout, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
96+
lyd_print_file(stdout, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
9797
}
9898
printf("\n");
9999
sr_release_data(data);
@@ -124,7 +124,7 @@ main(void)
124124

125125
/* print data */
126126
if (data) {
127-
lyd_print_file(stdout, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
127+
lyd_print_file(stdout, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
128128
}
129129
printf("\n");
130130
sr_release_data(data);

‎src/executables/sysrepocfg.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ op_export(sr_session_ctx_t *sess, const char *file_path, const char *module_name
396396
}
397397

398398
/* print exported data */
399-
lyd_print_file(file ? file : stdout, data ? data->tree : NULL, format, LYD_PRINT_WITHSIBLINGS | wd_opt);
399+
lyd_print_file(file ? file : stdout, data ? data->tree : NULL, format, LYD_PRINT_SIBLINGS | wd_opt);
400400
sr_release_data(data);
401401

402402
/* cleanup */

‎src/plugins/ds_json.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ srpds_json_store_(const char *path, const struct lyd_node *mod_data, const char
100100
}
101101

102102
/* print data */
103-
print_opts = LYD_PRINT_SHRINK | LYD_PRINT_KEEPEMPTYCONT | LYD_PRINT_WD_IMPL_TAG;
103+
print_opts = LYD_PRINT_SHRINK | LYD_PRINT_EMPTY_CONT | LYD_PRINT_WD_IMPL_TAG;
104104
if (lyd_print_all(out, mod_data, LYD_JSON, print_opts)) {
105105
err_info = srpjson_log_err_ly(srpds_name, LYD_CTX(mod_data));
106106
srplg_log_errinfo(&err_info, srpds_name, NULL, SR_ERR_INTERNAL, "Failed to store data into \"%s\".", tmp_path);

‎tests/test_apply_changes.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ module_change_done_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mo
317317
ret = sr_get_subtree(session, "/ietf-interfaces:interfaces", 0, &subtree);
318318
assert_int_equal(ret, SR_ERR_OK);
319319

320-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
320+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
321321
assert_int_equal(ret, 0);
322322
sr_release_data(subtree);
323323

@@ -453,7 +453,7 @@ module_change_done_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mo
453453
ret = sr_get_subtree(session, "/ietf-interfaces:interfaces", 0, &subtree);
454454
assert_int_equal(ret, SR_ERR_OK);
455455

456-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
456+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
457457
assert_int_equal(ret, 0);
458458
sr_release_data(subtree);
459459

@@ -506,7 +506,7 @@ apply_change_done_thread(void *arg)
506506
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
507507
assert_int_equal(ret, SR_ERR_OK);
508508

509-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
509+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
510510
assert_int_equal(ret, 0);
511511
sr_release_data(subtree);
512512

@@ -539,7 +539,7 @@ apply_change_done_thread(void *arg)
539539
/* check current data tree */
540540
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
541541
assert_int_equal(ret, SR_ERR_OK);
542-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
542+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
543543
assert_int_equal(ret, 0);
544544
assert_null(str1);
545545
sr_release_data(subtree);
@@ -716,7 +716,7 @@ module_update_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module_
716716
ret = sr_get_subtree(session, "/ietf-interfaces:interfaces", 0, &subtree);
717717
assert_int_equal(ret, SR_ERR_OK);
718718

719-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
719+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
720720
assert_int_equal(ret, 0);
721721
sr_release_data(subtree);
722722

@@ -848,7 +848,7 @@ apply_update_thread(void *arg)
848848
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
849849
assert_int_equal(ret, SR_ERR_OK);
850850

851-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
851+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
852852
assert_int_equal(ret, 0);
853853
sr_release_data(subtree);
854854

@@ -879,7 +879,7 @@ apply_update_thread(void *arg)
879879
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
880880
assert_int_equal(ret, SR_ERR_OK);
881881

882-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
882+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
883883
assert_int_equal(ret, 0);
884884

885885
assert_null(str1);
@@ -1408,7 +1408,7 @@ apply_update_fail_thread(void *arg)
14081408
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
14091409
assert_int_equal(ret, SR_ERR_OK);
14101410

1411-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
1411+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
14121412
assert_int_equal(ret, 0);
14131413

14141414
assert_null(str1);
@@ -1523,7 +1523,7 @@ test_update_foreign(void **state)
15231523
/* check current data tree */
15241524
ret = sr_get_data(sess, "/when1:* | /when2:*", 0, 0, 0, &data);
15251525
assert_int_equal(ret, SR_ERR_OK);
1526-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
1526+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
15271527
assert_int_equal(ret, 0);
15281528
sr_release_data(data);
15291529

@@ -1950,7 +1950,7 @@ apply_change_fail_thread(void *arg)
19501950
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
19511951
assert_int_equal(ret, SR_ERR_OK);
19521952

1953-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
1953+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
19541954
assert_int_equal(ret, 0);
19551955

19561956
assert_null(str1);
@@ -1975,7 +1975,7 @@ apply_change_fail_thread(void *arg)
19751975
ret = sr_get_subtree(sess, "/ietf-interfaces:interfaces", 0, &subtree);
19761976
assert_int_equal(ret, SR_ERR_OK);
19771977

1978-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
1978+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
19791979
assert_int_equal(ret, 0);
19801980

19811981
assert_null(str1);
@@ -2516,7 +2516,7 @@ apply_no_changes_thread(void *arg)
25162516
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
25172517
assert_int_equal(ret, SR_ERR_OK);
25182518

2519-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
2519+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
25202520
assert_int_equal(ret, 0);
25212521

25222522
sr_release_data(data);
@@ -2565,7 +2565,7 @@ apply_no_changes_thread(void *arg)
25652565
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
25662566
assert_int_equal(ret, SR_ERR_OK);
25672567

2568-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
2568+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
25692569
assert_int_equal(ret, 0);
25702570

25712571
sr_release_data(data);
@@ -2700,7 +2700,7 @@ module_change_any_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
27002700
ret = sr_get_subtree(session, "/test:cont", 0, &subtree);
27012701
assert_int_equal(ret, SR_ERR_OK);
27022702

2703-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
2703+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
27042704
assert_int_equal(ret, 0);
27052705
sr_release_data(subtree);
27062706

@@ -2760,7 +2760,7 @@ module_change_any_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
27602760
ret = sr_get_subtree(session, "/test:cont", 0, &subtree);
27612761
assert_int_equal(ret, SR_ERR_OK);
27622762

2763-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
2763+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
27642764
assert_int_equal(ret, 0);
27652765
sr_release_data(subtree);
27662766

@@ -2856,7 +2856,7 @@ apply_change_any_thread(void *arg)
28562856
ret = sr_get_subtree(sess, "/test:cont", 0, &subtree);
28572857
assert_int_equal(ret, SR_ERR_OK);
28582858

2859-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
2859+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
28602860
assert_int_equal(ret, 0);
28612861
sr_release_data(subtree);
28622862

@@ -2887,7 +2887,7 @@ apply_change_any_thread(void *arg)
28872887
ret = sr_get_subtree(sess, "/test:cont", 0, &subtree);
28882888
assert_int_equal(ret, SR_ERR_OK);
28892889

2890-
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
2890+
ret = lyd_print_mem(&str1, subtree->tree, LYD_XML, LYD_PRINT_SIBLINGS);
28912891
assert_int_equal(ret, 0);
28922892
sr_release_data(subtree);
28932893

@@ -3354,7 +3354,7 @@ apply_change_dflt_leaf_thread(void *arg)
33543354
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
33553355
assert_int_equal(ret, SR_ERR_OK);
33563356

3357-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
3357+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
33583358
assert_int_equal(ret, 0);
33593359

33603360
sr_release_data(data);
@@ -3396,7 +3396,7 @@ apply_change_dflt_leaf_thread(void *arg)
33963396
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
33973397
assert_int_equal(ret, SR_ERR_OK);
33983398

3399-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
3399+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
34003400
assert_int_equal(ret, 0);
34013401

34023402
sr_release_data(data);
@@ -3437,7 +3437,7 @@ apply_change_dflt_leaf_thread(void *arg)
34373437
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
34383438
assert_int_equal(ret, SR_ERR_OK);
34393439

3440-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
3440+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
34413441
assert_int_equal(ret, 0);
34423442

34433443
sr_release_data(data);
@@ -3476,7 +3476,7 @@ apply_change_dflt_leaf_thread(void *arg)
34763476
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
34773477
assert_int_equal(ret, SR_ERR_OK);
34783478

3479-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
3479+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
34803480
assert_int_equal(ret, 0);
34813481

34823482
sr_release_data(data);
@@ -3515,7 +3515,7 @@ apply_change_dflt_leaf_thread(void *arg)
35153515
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
35163516
assert_int_equal(ret, SR_ERR_OK);
35173517

3518-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
3518+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
35193519
assert_int_equal(ret, 0);
35203520

35213521
sr_release_data(data);
@@ -4612,7 +4612,7 @@ apply_change_dflt_create_thread(void *arg)
46124612
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
46134613
assert_int_equal(ret, SR_ERR_OK);
46144614

4615-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
4615+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
46164616
assert_int_equal(ret, 0);
46174617

46184618
sr_release_data(data);
@@ -4636,7 +4636,7 @@ apply_change_dflt_create_thread(void *arg)
46364636
ret = sr_get_data(sess, "/defaults:*", 0, 0, 0, &data);
46374637
assert_int_equal(ret, SR_ERR_OK);
46384638

4639-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_IMPL_TAG);
4639+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_WD_IMPL_TAG);
46404640
assert_int_equal(ret, 0);
46414641

46424642
sr_release_data(data);
@@ -7094,7 +7094,7 @@ test_change_schema_mount_data_autodel(void **arg)
70947094
ret = sr_get_data(sess, "/sm:root/ops:cont", 0, 0, 0, &data);
70957095
assert_int_equal(ret, SR_ERR_OK);
70967096

7097-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
7097+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
70987098
sr_release_data(data);
70997099
assert_int_equal(ret, LY_SUCCESS);
71007100
assert_null(str1);
@@ -7505,7 +7505,7 @@ module_diff_reuse_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
75057505
const size_t NUM_SUBS = 7;
75067506

75077507
diff = sr_get_change_diff(session);
7508-
ret = lyd_print_mem(&diff_str, diff, LYD_XML, LYD_PRINT_WITHSIBLINGS);
7508+
ret = lyd_print_mem(&diff_str, diff, LYD_XML, LYD_PRINT_SIBLINGS);
75097509
assert_int_equal(ret, SR_ERR_OK);
75107510

75117511
if (cb_called < NUM_SUBS) {
@@ -8202,7 +8202,7 @@ apply_list_replace_thread(void *arg)
82028202
/* check current data tree */
82038203
ret = sr_get_data(sess, "/ietf-interfaces:interfaces", 0, 0, 0, &data);
82048204
assert_int_equal(ret, SR_ERR_OK);
8205-
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
8205+
ret = lyd_print_mem(&str1, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
82068206
sr_release_data(data);
82078207
assert_int_equal(ret, LY_SUCCESS);
82088208

‎tests/test_candidate.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ test_basic(void **state)
147147
ret = sr_get_data(st->sess, "/ietf-interfaces:*", 0, 0, 0, &data);
148148
assert_int_equal(ret, SR_ERR_OK);
149149

150-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
150+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
151151
sr_release_data(data);
152152
str2 =
153153
"<interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\">\n"
@@ -164,7 +164,7 @@ test_basic(void **state)
164164
ret = sr_get_data(st->sess, "/ietf-interfaces:*", 0, 0, 0, &data);
165165
assert_int_equal(ret, SR_ERR_OK);
166166

167-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
167+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
168168
sr_release_data(data);
169169
str2 =
170170
"<interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\">\n"
@@ -190,7 +190,7 @@ test_basic(void **state)
190190
ret = sr_get_data(st->sess, "/ietf-interfaces:*", 0, 0, 0, &data);
191191
assert_int_equal(ret, SR_ERR_OK);
192192

193-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
193+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
194194
sr_release_data(data);
195195
str2 =
196196
"<interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\">\n"
@@ -240,7 +240,7 @@ test_invalid(void **state)
240240
ret = sr_get_data(st->sess, "/ietf-interfaces:*", 0, 0, 0, &data);
241241
assert_int_equal(ret, SR_ERR_OK);
242242

243-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
243+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
244244
sr_release_data(data);
245245
str2 =
246246
"<interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\">\n"
@@ -288,7 +288,7 @@ test_when(void **state)
288288
ret = sr_get_data(st->sess, "/when1:*", 0, 0, 0, &data);
289289
assert_int_equal(ret, SR_ERR_OK);
290290

291-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
291+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
292292
sr_release_data(data);
293293
assert_string_equal(str, str2);
294294
free(str);
@@ -316,7 +316,7 @@ test_when(void **state)
316316
ret = sr_get_data(st->sess, "/when1:*", 0, 0, 0, &data);
317317
assert_int_equal(ret, SR_ERR_OK);
318318

319-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
319+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
320320
sr_release_data(data);
321321
assert_string_equal(str, str2);
322322
free(str);
@@ -380,7 +380,7 @@ test_reset_unlock(void **state)
380380
ret = sr_get_data(st->sess, "/ietf-interfaces:*", 0, 0, 0, &data);
381381
assert_int_equal(ret, SR_ERR_OK);
382382

383-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
383+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
384384
sr_release_data(data);
385385
str2 =
386386
"<interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\">\n"
@@ -452,7 +452,7 @@ test_reset_session_stop(void **state)
452452
ret = sr_get_data(sess2, "/ietf-interfaces:*", 0, 0, 0, &data);
453453
assert_int_equal(ret, SR_ERR_OK);
454454

455-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS);
455+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS);
456456
sr_release_data(data);
457457
str2 =
458458
"<interfaces xmlns=\"urn:ietf:params:xml:ns:yang:ietf-interfaces\">\n"

‎tests/test_context_change.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ test_push_oper(void **state)
494494
/* read the data back */
495495
ret = sr_get_data(sess, "/mod1:*", 0, 0, 0, &data);
496496
assert_int_equal(ret, SR_ERR_OK);
497-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
497+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
498498
sr_release_data(data);
499499

500500
assert_string_equal(str,
@@ -511,7 +511,7 @@ test_push_oper(void **state)
511511
/* check push oper data now, l2 leaf was disabled */
512512
ret = sr_get_data(sess, "/mod1:*", 0, 0, 0, &data);
513513
assert_int_equal(ret, SR_ERR_OK);
514-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
514+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
515515
sr_release_data(data);
516516

517517
assert_string_equal(str,
@@ -537,7 +537,7 @@ test_push_oper(void **state)
537537

538538
ret = sr_get_data(sess, "/mod1:*", 0, 0, 0, &data);
539539
assert_int_equal(ret, SR_ERR_OK);
540-
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_WITHSIBLINGS | LYD_PRINT_SHRINK);
540+
lyd_print_mem(&str, data->tree, LYD_XML, LYD_PRINT_SIBLINGS | LYD_PRINT_SHRINK);
541541
sr_release_data(data);
542542

543543
assert_string_equal(str,

0 commit comments

Comments
 (0)