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

Changed code so that it will be compatible with c++.

Browse source 
1. Added #ifdef extern "C" to public header files.
2. Changed variables that are key words in c++, to different names (like ns instead of namespace).
3. Changed char* to const char* for constant strings.
This commit is contained in:
shmuels 2020-07-02 15:00:53 +03:00
parent eda4a58ebf
commit 58ea4eba27
27 changed files with 274 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/src/clixon_validate.c
View file

@ -238,7 +238,7 @@ validate_identityref(cxobj *xt,
* see IDENTITYREF_KLUDGE
*/
if (0){
char *namespace;
char *ns;
yang_stmt *ymod;
yang_stmt *yspec;
@ -246,11 +246,11 @@ validate_identityref(cxobj *xt,
* identityref list associated with the base identities.
*/
/* Get namespace (of idref) from xml */
if (xml2ns(xt, prefix, &namespace) < 0)
if (xml2ns(xt, prefix, &ns) < 0)
goto done;
yspec = ys_spec(ys);
/* Get module of that namespace */
if ((ymod = yang_find_module_by_namespace(yspec, namespace)) == NULL){
if ((ymod = yang_find_module_by_namespace(yspec, ns)) == NULL){
clicon_err(OE_YANG, ENOENT, "No module found");
goto done;
}
@ -1083,7 +1083,7 @@ xml_yang_validate_all(clicon_handle h,
int ret;
cxobj *x;
cxobj *xp;
char *namespace = NULL;
char *ns = NULL;
cbuf *cb = NULL;
cvec *nsc = NULL;
@ -1100,10 +1100,10 @@ xml_yang_validate_all(clicon_handle h,
cprintf(cb, "Failed to find YANG spec of XML node: %s", xml_name(xt));
if ((xp = xml_parent(xt)) != NULL)
cprintf(cb, " with parent: %s", xml_name(xp));
if (xml2ns(xt, xml_prefix(xt), &namespace) < 0)
if (xml2ns(xt, xml_prefix(xt), &ns) < 0)
goto done;
if (namespace)
cprintf(cb, " in namespace: %s", namespace);
if (ns)
cprintf(cb, " in namespace: %s", ns);
if (netconf_unknown_element_xml(xret, "application", xml_name(xt), cbuf_get(cb)) < 0)
goto done;
goto fail;