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

Merge branch 'master' of https://github.com/clicon/clixon

Browse source
This commit is contained in:
Olof hagsand 2019-04-07 16:04:23 +02:00
commit a37b89600f
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -33,8 +33,8 @@
* CLICON_XML_CHANGELOG enables the yang changelog feature * CLICON_XML_CHANGELOG enables the yang changelog feature
* CLICON_XML_CHANGELOG_FILE where the changelog resides * CLICON_XML_CHANGELOG_FILE where the changelog resides
### API changes on existing features (you may need to change your code) * xmldb_get() removed "config" parameter:
* Change all calls to dbget from: `xmldb_get(h, db, xpath, 0|1, &xret, msd)` to `xmldb_get(h, db, xpath, &xret, msd)`
* Structural change: removed datastore plugin and directory, and merged into regular clixon lib code. * Structural change: removed datastore plugin and directory, and merged into regular clixon lib code.
* The CLICON_XMLDB_PLUGIN config option is obsolete, you should remove it from your config file * The CLICON_XMLDB_PLUGIN config option is obsolete, you should remove it from your config file
* All references to plugin "text.so" should be removed. * All references to plugin "text.so" should be removed.

1
lib/clixon/clixon_xml_map.h
View file

@ -51,6 +51,7 @@ int xml_yang_validate_all(cxobj *xt, cbuf *cbret);
int xml_yang_validate_all_top(cxobj *xt, cbuf *cbret); int xml_yang_validate_all_top(cxobj *xt, cbuf *cbret);
int xml2cvec(cxobj *xt, yang_stmt *ys, cvec **cvv0); int xml2cvec(cxobj *xt, yang_stmt *ys, cvec **cvv0);
int cvec2xml_1(cvec *cvv, char *toptag, cxobj *xp, cxobj **xt0); int cvec2xml_1(cvec *cvv, char *toptag, cxobj *xp, cxobj **xt0);
int xml_diff(yang_stmt *yspec, cxobj *x0, cxobj *x1, int xml_diff(yang_stmt *yspec, cxobj *x0, cxobj *x1,
cxobj ***first, size_t *firstlen, cxobj ***first, size_t *firstlen,
cxobj ***second, size_t *secondlen, cxobj ***second, size_t *secondlen,

2
lib/src/clixon_datastore_read.c
View file

@ -598,7 +598,7 @@ xmldb_get1_cache(clicon_handle h,
modstate_diff_t *modst) modstate_diff_t *modst)
{ {
int retval = -1; int retval = -1;
yang_spec *yspec; yang_stmt *yspec;
cxobj *x0t = NULL; /* (cached) top of tree */ cxobj *x0t = NULL; /* (cached) top of tree */
cxobj **xvec = NULL; cxobj **xvec = NULL;
size_t xlen; size_t xlen;