From b346f80548c0966e3149b0d4cd4b193552c4a70c Mon Sep 17 00:00:00 2001 From: "Lu.Mao" Date: Thu, 1 Aug 2024 09:54:14 +0800 Subject: [PATCH] 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 (cherry picked from commit 87c9060f90b6b9b5a69ad1e6ba6e8ebc58d94374) --- lib/yang.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/yang.c b/lib/yang.c index 44459df4a50a..6a8e5223a09c 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); }