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

* Preparations for Clixon 5.4 release, docs, readme:s, etc

Browse source
This commit is contained in:
Olof hagsand 2021-11-29 13:52:52 +01:00
parent f4b35cb270
commit 716d0cb15f
9 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/clixon_file.c
View file

@ -138,7 +138,7 @@ clicon_files_recursive(const char *dir,
int res = 0;
char errbuf[128];
clicon_debug(1, "%s dir:%s", __FUNCTION__, dir);
clicon_debug(2, "%s dir:%s", __FUNCTION__, dir);
if (regexp && (res = regcomp(&re, regexp, REG_EXTENDED)) != 0) {
regerror(res, &re, errbuf, sizeof(errbuf));
clicon_err(OE_DB, 0, "regcomp: %s", errbuf);

2
lib/src/clixon_xml.c
View file

@ -170,7 +170,7 @@ struct xml{
struct xml *x_up_candidate; /* Candidate parent node for special cases (when+xpath) */
#endif
int _x_vector_i; /* internal use: xml_child_each */
int _x_i; /* internal use for sorting:
int _x_i; /* internal use for stable sorting:
see xml_enumerate and xml_cmp */
/*----- next is body/attribute only */
cbuf *x_value_cb; /* attribute and body nodes have values (XXX: this consumes

2
lib/src/clixon_xml_sort.c
View file

@ -416,7 +416,7 @@ xml_sort(cxobj *x)
if ((ys = xml_spec(x)) != 0 && yang_config(ys)==0)
return 1;
#endif
xml_enumerate_children(x);
xml_enumerate_children(x); /* This is to make sorting "stable", ie not change existing order */
qsort(xml_childvec_get(x), xml_child_nr(x), sizeof(cxobj *), xml_cmp_qsort);
return 0;
}

4
lib/src/clixon_yang.c
View file

@ -2690,6 +2690,7 @@ yang_if_feature(clicon_handle h,
int opand = -1; /* -1:not set, 0:or, 1:and */
int enabled = 0;
cg_var *cv;
if ((vec = clicon_strsep(ys->ys_argument, " \t\r\n", &nvec)) == NULL)
goto done;
/* Two steps: first detect operators
@ -3026,7 +3027,8 @@ schema_nodeid_iterate(yang_stmt *yn,
goto done;
}
if (ys == NULL){
clicon_debug(1, "%s: %s not found", __FUNCTION__, id);
clicon_debug(1, "%s: %s not found, last id found:%s",
__FUNCTION__, id, yang_argument_get(yp));
goto ok;
}
yp = ys; /* ys is matched */