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

Structural C-code change: Merged yang_spec and yang_node types into yang_stmt

Browse source
This commit is contained in:
Olof hagsand 2019-04-02 12:27:33 +02:00
parent 4f9e942103
commit b5f1f7346e
52 changed files with 492 additions and 496 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/src/clixon_datastore_read.c
View file

@ -186,7 +186,7 @@ xml_copy_marked(cxobj *x0,
* node in list is marked */
if (mark && yt && yt->ys_keyword == Y_LIST){
/* XXX: I think yang_key_match is suboptimal here */
if ((iskey = yang_key_match((yang_node*)yt, name)) < 0)
if ((iskey = yang_key_match(yt, name)) < 0)
goto done;
if (iskey){
if ((xcopy = xml_new(name, x1, xml_spec(x))) == NULL)
@ -220,7 +220,7 @@ xml_copy_marked(cxobj *x0,
*/
static int
text_read_modstate(clicon_handle h,
yang_spec *yspec,
yang_stmt *yspec,
cxobj *xt,
modstate_diff_t *msd)
{
@ -306,7 +306,7 @@ text_read_modstate(clicon_handle h,
int
xmldb_readfile(clicon_handle h,
const char *db,
yang_spec *yspec,
yang_stmt *yspec,
cxobj **xp,
modstate_diff_t *msd)
{
@ -391,7 +391,7 @@ xmldb_get_nocache(clicon_handle h,
{
int retval = -1;
char *dbfile = NULL;
yang_spec *yspec;
yang_stmt *yspec;
cxobj *xt = NULL;
cxobj *x;
int fd = -1;
@ -513,7 +513,7 @@ xmldb_get_cache(clicon_handle h,
modstate_diff_t *msd)
{
int retval = -1;
yang_spec *yspec;
yang_stmt *yspec;
cxobj *x0t = NULL; /* (cached) top of tree */
cxobj *x0;
cxobj **xvec = NULL;