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

show EXPLICIT compare diff only

Browse source
This commit is contained in:
Olof hagsand 2025-01-24 13:23:38 +01:00
parent eff01d924c
commit 0ad59d3300
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -48,6 +48,7 @@ Developers may need to change their code
### Corrected Bugs ### Corrected Bugs
* Fixed: [Incorrect fields displayed for "show compare" and "commit diff"](https://github.com/clicon/clixon-controller/issues/177)
* Fixed: [Documentation corresponding to specific release](https://github.com/clicon/clixon-controller/issues/178) * Fixed: [Documentation corresponding to specific release](https://github.com/clicon/clixon-controller/issues/178)
* https://clixon-docs.readthedocs.io/en/stable points to lastest release, starting with 7.2.0 * https://clixon-docs.readthedocs.io/en/stable points to lastest release, starting with 7.2.0
* Fixed: [Backend hangs when doing "process services restart" in the CLI](https://github.com/clicon/clixon-controller/issues/178) * Fixed: [Backend hangs when doing "process services restart" in the CLI](https://github.com/clicon/clixon-controller/issues/178)

6
lib/src/clixon_datastore_read.c
View file

@ -844,7 +844,6 @@ xmldb_get_cache(clixon_handle h,
* @param[in] yb How to bind yang to XML top-level when parsing * @param[in] yb How to bind yang to XML top-level when parsing
* @param[in] nsc External XML namespace context, or NULL * @param[in] nsc External XML namespace context, or NULL
* @param[in] xpath String with XPath syntax. or NULL for all * @param[in] xpath String with XPath syntax. or NULL for all
* @param[in] wdef With-defaults parameter, see RFC 6243
* @param[out] xret Single return XML tree. Free with xml_free() * @param[out] xret Single return XML tree. Free with xml_free()
* @param[out] msdiff If set, return modules-state differences * @param[out] msdiff If set, return modules-state differences
* @param[out] xerr XML error if retval is 0 * @param[out] xerr XML error if retval is 0
@ -859,7 +858,6 @@ xmldb_get_copy(clixon_handle h,
yang_bind yb, yang_bind yb,
cvec *nsc, cvec *nsc,
const char *xpath, const char *xpath,
withdefaults_type wdef,
cxobj **xret, cxobj **xret,
modstate_diff_t *msdiff, modstate_diff_t *msdiff,
cxobj **xerr) cxobj **xerr)
@ -1052,8 +1050,8 @@ xmldb_get0(clixon_handle h,
cxobj *x = NULL; cxobj *x = NULL;
if (wdef != WITHDEFAULTS_EXPLICIT) if (wdef != WITHDEFAULTS_EXPLICIT)
return xmldb_get_copy(h, db, yb, nsc, xpath, 0, xret, msdiff, xerr); return xmldb_get_copy(h, db, yb, nsc, xpath, xret, msdiff, xerr);
if ((ret = xmldb_get_copy(h, db, yb, nsc, xpath, 0, &x, msdiff, xerr)) < 0) if ((ret = xmldb_get_copy(h, db, yb, nsc, xpath, &x, msdiff, xerr)) < 0)
goto done; goto done;
if (ret == 0) if (ret == 0)
goto fail; goto fail;

1
lib/src/clixon_text_syntax.c
View file

@ -120,6 +120,7 @@ tleaf(cxobj *x)
* 0: No leaflist * 0: No leaflist
* 1: In leaflist * 1: In leaflist
* @see text2cbuf to buffer (slower) * @see text2cbuf to buffer (slower)
* XXX No with-defaults support as in xml2cbuf
*/ */
static int static int
text2file(cxobj *xn, text2file(cxobj *xn,

16
lib/src/clixon_xml_io.c
View file

@ -1461,7 +1461,7 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, x1c, level+1, 1, "+", -1, 0) < 0) if (clixon_xml2cbuf1(cb, x1c, level+1, 1, "+", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT); x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue; continue;
@ -1472,7 +1472,7 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, x0c, level+1, 1, "-", -1, 0) < 0) if (clixon_xml2cbuf1(cb, x0c, level+1, 1, "-", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
x0c = xml_child_each(x0, x0c, CX_ELMNT); x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue; continue;
@ -1495,7 +1495,7 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, xi, level+1, 1, "-", -1, 0) < 0) if (clixon_xml2cbuf1(cb, xi, level+1, 1, "-", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
} }
} }
@ -1513,7 +1513,7 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, xj, level+1, 1, "+", -1, 0) < 0) if (clixon_xml2cbuf1(cb, xj, level+1, 1, "+", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
} }
} }
@ -1528,7 +1528,7 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, x0c, level+1, 1, "-", -1, 0) < 0) if (clixon_xml2cbuf1(cb, x0c, level+1, 1, "-", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
x0c = xml_child_each(x0, x0c, CX_ELMNT); x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue; continue;
@ -1539,7 +1539,7 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x1, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, x1c, level+1, 1, "+", -1, 0) < 0) if (clixon_xml2cbuf1(cb, x1c, level+1, 1, "+", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
x1c = xml_child_each(x1, x1c, CX_ELMNT); x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue; continue;
@ -1554,9 +1554,9 @@ xml_diff2cbuf(cbuf *cb,
xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT); xml_diff_keys(cb, x0, y0, (level+1)*PRETTYPRINT_INDENT);
nr++; nr++;
} }
if (clixon_xml2cbuf(cb, x0c, level+1, 1, "-", -1, 0) < 0) if (clixon_xml2cbuf1(cb, x0c, level+1, 1, "-", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
if (clixon_xml2cbuf(cb, x1c, level+1, 1, "+", -1, 0) < 0) if (clixon_xml2cbuf1(cb, x1c, level+1, 1, "+", -1, 0, WITHDEFAULTS_EXPLICIT) < 0)
goto done; goto done;
} }
else if (y0c && yang_keyword_get(y0c) == Y_LEAF){ else if (y0c && yang_keyword_get(y0c) == Y_LEAF){