Fixed case of multiple deviation bug for non-orig pointer

olofhagsand · olofhagsand · commit ca834a847de3 · 2025-10-19T19:21:25.000+02:00
See: [Multiple deviations to same grouping when CLICON_YANG_USE_ORIGINAL doesnt work](#629)
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
@@ -2635,7 +2635,6 @@ yang_print_cbuf(cbuf      *cb,
 int
 yang_deviation(yang_stmt *ys,
                void      *arg)
-
 {
     int           retval = -1;
     char         *nodeid;
@@ -2740,7 +2739,7 @@ yang_deviation(yang_stmt *ys,
                     }
                     break;
                 }
-                if (_yang_use_orig && yang_orig_get(ytarget) != NULL)
+                if (_yang_use_orig && yang_orig_get(ytarget) != NULL && uses_orig_ptr(kw))
                     ;
                 else {
                     /* Remove old */

Original file line number	Diff line number	Diff line change
`@@ -2635,7 +2635,6 @@ yang_print_cbuf(cbuf *cb,`
`2635`	`2635`	`int`
`2636`	`2636`	`yang_deviation(yang_stmt *ys,`
`2637`	`2637`	`void *arg)`
`2638`		`-`
`2639`	`2638`	`{`
`2640`	`2639`	`int retval = -1;`
`2641`	`2640`	`char *nodeid;`
`@@ -2740,7 +2739,7 @@ yang_deviation(yang_stmt *ys,`
`2740`	`2739`	`}`
`2741`	`2740`	`break;`
`2742`	`2741`	`}`
`2743`		`- if (_yang_use_orig && yang_orig_get(ytarget) != NULL)`
	`2742`	`+ if (_yang_use_orig && yang_orig_get(ytarget) != NULL && uses_orig_ptr(kw))`
`2744`	`2743`	`;`
`2745`	`2744`	`else {`
`2746`	`2745`	`/* Remove old */`