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

* C-API change: xml_new() changed from xml_new(name, xp, ys) to xml_new(name, prefix, xp, type)

Browse source 
* If you have used, `ys`, add `xml_spec_set(x, ys)` after the statement
  * If you have `xml_type_set(x, TYPE)` or `xml_prefix_set(x, PREFIX)` immediately after the statement, you can remove those and set them directly as: `xml_new(name, PREFIX, xp, TYPE)`
This commit is contained in:
Olof hagsand 2020-03-12 22:29:28 +01:00
parent 71efe18f94
commit 7425a3b520
26 changed files with 135 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/src/clixon_path.c
View file

@ -953,12 +953,12 @@ api_path2xml_vec(char **vec,
clicon_err(OE_XML, 0, "malformed key, expected '=restval'");
goto done;
}
if ((x = xml_new(yang_argument_get(y), x0, y)) == NULL)
if ((x = xml_new(yang_argument_get(y), NULL, x0, CX_ELMNT)) == NULL)
goto done;
xml_type_set(x, CX_ELMNT);
if ((xb = xml_new("body", x, NULL)) == NULL)
xml_spec_set(x, y);
if ((xb = xml_new("body", NULL, x, CX_BODY)) == NULL)
goto done;
xml_type_set(xb, CX_BODY);
if (restval && xml_value_set(xb, restval) < 0)
goto done;
break;
@ -991,9 +991,10 @@ api_path2xml_vec(char **vec,
}
cvi = NULL;
/* create list object */
if ((x = xml_new(name, x0, y)) == NULL)
if ((x = xml_new(name, NULL, x0, CX_ELMNT)) == NULL)
goto done;
xml_type_set(x, CX_ELMNT);
xml_spec_set(x, y);
vi = 0;
/* Create keys */
while ((cvi = cvec_each(cvk, cvi)) != NULL){
@ -1005,12 +1006,12 @@ api_path2xml_vec(char **vec,
goto done;
goto fail;
}
if ((xn = xml_new(keyname, x, ykey)) == NULL)
if ((xn = xml_new(keyname, NULL, x, CX_ELMNT)) == NULL)
goto done;
xml_type_set(xn, CX_ELMNT);
if ((xb = xml_new("body", xn, NULL)) == NULL)
xml_spec_set(xn, ykey);
if ((xb = xml_new("body", NULL, xn, CX_BODY)) == NULL)
goto done;
xml_type_set(xb, CX_BODY);
if (vi++ < nvalvec){
if (xml_value_set(xb, valvec[vi-1]) < 0)
goto done;
@ -1019,9 +1020,9 @@ api_path2xml_vec(char **vec,
break;
default: /* eg Y_CONTAINER, Y_LEAF */
if ((x = xml_find_type(x0, NULL, name, CX_ELMNT)) == NULL){ /* eg key of list */
if ((x = xml_new(name, x0, y)) == NULL)
if ((x = xml_new(name, NULL, x0, CX_ELMNT)) == NULL)
goto done;
xml_type_set(x, CX_ELMNT);
xml_spec_set(x, y);
}
break;
}