From: Lu.Mao <Lu.Mao@molex.com>
Date: Thu, 1 Aug 2024 01:54:14 +0000 (+0800)
Subject: lib: Fix LYD_NEW_PATH_OUTPUT issue to support libyang v3.x
X-Git-Tag: docker/10.1.1~3^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F16776%2Fhead;p=mirror%2Ffrr.git

lib: Fix LYD_NEW_PATH_OUTPUT issue to support libyang v3.x

Fix the LYD_NEW_PATH_OUTPUT undeclared error to support the latest libyang v3.x version,
and also compatible with old version.

Signed-off-by: Lu Mao <lu.mao@molex.com>
(cherry picked from commit 87c9060f90b6b9b5a69ad1e6ba6e8ebc58d94374)
---

diff --git a/lib/yang.c b/lib/yang.c
index 44459df4a5..6a8e5223a0 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -25,6 +25,11 @@ DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure");
 #define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, \
 			     set)                                              \
 	lyd_find_xpath3(ctx_node, tree, xpath, vars, set)
+
+#ifndef LYD_NEW_VAL_OUTPUT
+#define LYD_NEW_VAL_OUTPUT LYD_NEW_PATH_OUTPUT
+#endif
+
 #else
 #define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, \
 			     set)                                              \
@@ -671,7 +676,7 @@ void yang_dnode_rpc_output_add(struct lyd_node *output, const char *xpath,
 	LY_ERR err;
 
 	err = lyd_new_path(output, ly_native_ctx, xpath, value,
-			   LYD_NEW_PATH_OUTPUT | LYD_NEW_PATH_UPDATE, NULL);
+			   LYD_NEW_VAL_OUTPUT | LYD_NEW_PATH_UPDATE, NULL);
 	assert(err == LY_SUCCESS);
 }