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

remove xml x_cv; added makes to jenkinsfile

Browse source
This commit is contained in:
Olof hagsand 2018-06-17 23:09:36 +02:00
parent 5a8660afb6
commit 5304acb086
3 changed files with 14 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/clixon/clixon_xml.h
View file

@ -107,9 +107,6 @@ char *xml_value_append(cxobj *xn, char *val);
enum cxobj_type xml_type(cxobj *xn);
int xml_type_set(cxobj *xn, enum cxobj_type type);
cg_var *xml_cv_get(cxobj *xn);
int xml_cv_set(cxobj *xn, cg_var *cv);
int xml_child_nr(cxobj *xn);
int xml_child_nr_type(cxobj *xn, enum cxobj_type type);
cxobj *xml_child_i(cxobj *xn, int i);

40
lib/src/clixon_xml.c
View file

@ -112,7 +112,6 @@ struct xml{
int x_flags; /* Flags according to XML_FLAG_* */
yang_stmt *x_spec; /* Pointer to specification, eg yang, by
reference, dont free */
cg_var *x_cv; /* If body this contains the typed value */
};
/* Mapping between xml type <--> string */
@ -413,35 +412,6 @@ xml_type_set(cxobj *xn,
return old;
}
/*! Get cligen variable associated with node
* @param[in] xn xml node
* @retval cv Cligen variable if set
* @retval NULL If not set, or not applicable
*/
cg_var *
xml_cv_get(cxobj *xn)
{
if (xn->x_cv)
return xn->x_cv;
else
return NULL;
}
/*! Set cligen variable associated with node
* @param[in] xn xml node
* @param[in] cv Cligen variable or NULL
* @retval 0 if OK
*/
int
xml_cv_set(cxobj *xn,
cg_var *cv)
{
if (xn->x_cv)
free(xn->x_cv);
xn->x_cv = cv;
return 0;
}
/*! Get number of children
* @param[in] xn xml node
* @retval number of children in XML tree
@ -999,8 +969,6 @@ xml_free(cxobj *x)
free(x->x_value);
if (x->x_namespace)
free(x->x_namespace);
if (x->x_cv)
cv_free(x->x_cv);
for (i=0; i<x->x_childvec_len; i++){
if ((xc = x->x_childvec[i]) != NULL){
xml_free(xc);
@ -1531,14 +1499,6 @@ xml_copy_one(cxobj *x0,
if (xml_name(x0)) /* malloced string */
if ((xml_name_set(x1, xml_name(x0))) < 0)
return -1;
if (xml_cv_get(x0)){
if ((cv1 = cv_dup(xml_cv_get(x0))) == NULL){
clicon_err(OE_XML, errno, "cv_dup");
return -1;
}
if ((xml_cv_set(x1, cv1)) < 0)
return -1;
}
return 0;
}

17
test/Jenkinsfile vendored
View file

@ -18,8 +18,19 @@ node {
*/
sh 'make'
}
stage('Testing') {
stage('Make install') {
sh 'make install'
}
stage('Make install-include') {
sh 'make install-include'
}
stage('Make Example') {
sh 'cd example'
sh 'make'
sh 'sudo make install'
}
stage('Testing') {
sh 'cd test'
sh './all.sh'
}
}