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

replace xml_nopresence functions with xml_defaults_nopresence

Browse source
This commit is contained in:
Olof hagsand 2022-08-27 17:16:30 +02:00
parent 2e3a5a6334
commit c8bf718db8
5 changed files with 56 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/backend/backend_plugin.c
View file

@ -387,15 +387,9 @@ clixon_plugin_statedata_all(clicon_handle h,
}
if (xml_sort_recurse(x) < 0)
goto done;
/* Mark non-presence containers */
if (xml_apply(x, CX_ELMNT, xml_nopresence_default_mark, (void*)XML_FLAG_TRANSIENT) < 0)
/* Remove global defaults and empty non-presence containers */
if (xml_defaults_nopresence(x, 1) < 0)
goto done;
/* Clear XML tree of defaults */
if (xml_tree_prune_flagged(x, XML_FLAG_TRANSIENT, 1) < 0)
goto done;
/* clear mark and change */
xml_apply0(x, CX_ELMNT, (xml_applyfn_t*)xml_flag_reset,
(void*)(0xffff));
if (xml_default_recurse(x, 1) < 0)
goto done;
if ((ret = netconf_trymerge(x, yspec, xret)) < 0)