experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extended purge argument to xml_defaults_nopresence to handle non-config case

Browse source 
Test: with-defaults: added headings to all test cases
This commit is contained in:
Olof hagsand 2022-09-07 15:18:48 +02:00
parent 2d23c9656b
commit 38f501be19
5 changed files with 49 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/src/clixon_datastore_read.c
View file

@ -890,7 +890,7 @@ xmldb_get_cache(clicon_handle h,
goto done;
}
/* Remove global defaults and empty non-presence containers */
if (xml_defaults_nopresence(x0t, 1) < 0)
if (xml_defaults_nopresence(x0t, 2) < 0)
goto done;
if (yb != YB_NONE){
/* Add default global values */
@ -1163,7 +1163,7 @@ xmldb_get0_clear(clicon_handle h,
if (x == NULL)
goto ok;
/* Remove global defaults and empty non-presence containers */
if (xml_defaults_nopresence(x, 1) < 0)
if (xml_defaults_nopresence(x, 2) < 0)
goto done;
/* Clear XML tree of defaults */
if (xml_tree_prune_flagged(x, XML_FLAG_TRANSIENT, 1) < 0)