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

Fixed: [show compare/diff problems with sorted-by user](https://github.com/clicon/clixon/issues/482) xml_diff()

Browse source
This commit is contained in:
Olof hagsand 2024-01-24 10:20:21 +01:00
parent 121cd3ed2e
commit 60ded12ea7
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/src/clixon_xml_map.c
View file

@ -374,6 +374,7 @@ xml_diff_ordered_by_user(cxobj *x0,
* perspective, ie both have the same yang spec, if they are lists, they have the
* the same keys. NOT that the values are equal!
* @see xml_diff API function, this one is internal and recursive
* @see xml_diff2cbuf, clixon_text_diff2cbuf for +/- diff for XML and TEXT formats
* @note reordering in ordered-by user is NOT supported
*/
static int
@ -422,7 +423,7 @@ xml_diff1(cxobj *x0,
yc0 = xml_spec(x0c);
yc1 = xml_spec(x1c);
/* override ordered-by user with special look-ahead checks */
if (eq && yc0 && yc1 && yang_find(yc0, Y_ORDERED_BY, "user")){
if (eq && yc0 && yc1 && yc0 == yc1 && yang_find(yc0, Y_ORDERED_BY, "user")){
if (xml_diff_ordered_by_user(x0, x1, x0c, x1c, yc0,
x0vec, x0veclen, x1vec, x1veclen,
changed_x0, changed_x1, changedlen) < 0)