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

Fixed: Problem with cl:ignore attribute for show compare

Browse source
This commit is contained in:
Olof hagsand 2024-02-06 20:15:48 +01:00
parent d660c01a58
commit 99deddb47e
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/src/clixon_xml_map.c
View file

@ -614,8 +614,18 @@ xml_tree_equal(cxobj *x0,
if ((yc0 = xml_spec(x0c)) != NULL){ if ((yc0 = xml_spec(x0c)) != NULL){
if (yang_extension_value(yc0, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0) if (yang_extension_value(yc0, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done; goto done;
if (extflag) if (extflag){ /* skip */
goto ok; x0c = xml_child_each(x0, x0c, CX_ELMNT);
continue;
}
}
if ((yc1 = xml_spec(x1c)) != NULL){
if (yang_extension_value(yc1, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
goto done;
if (extflag){ /* skip */
x1c = xml_child_each(x1, x1c, CX_ELMNT);
continue;
}
} }
/* Both x0c and x1c exists, check if they are yang-equal. */ /* Both x0c and x1c exists, check if they are yang-equal. */
if ((eq = xml_cmp(x0c, x1c, 0, 0, NULL)) != 0){ if ((eq = xml_cmp(x0c, x1c, 0, 0, NULL)) != 0){
@ -625,8 +635,6 @@ xml_tree_equal(cxobj *x0,
/* xml-spec NULL could happen with anydata children for example, /* xml-spec NULL could happen with anydata children for example,
* if so, continue compare children but without yang * if so, continue compare children but without yang
*/ */
yc0 = xml_spec(x0c);
yc1 = xml_spec(x1c);
if (yc0 && yc1 && yc0 != yc1){ /* choice */ if (yc0 && yc1 && yc0 != yc1){ /* choice */
goto done; goto done;
} }