proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-05 19:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Fix LYD_NEW_PATH_OUTPUT issue to support libyang v3.x

Browse Source 
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 87c9060f90)
This commit is contained in:
Lu.Mao 2024-08-01 09:54:14 +08:00 committed by Mergify
parent c60f439098
commit b346f80548
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/yang.c
View File

@ -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, \ #define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, \
set) \ set) \
lyd_find_xpath3(ctx_node, tree, xpath, 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 #else
#define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, \ #define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, \
set) \ set) \
@ -671,7 +676,7 @@ void yang_dnode_rpc_output_add(struct lyd_node *output, const char *xpath,
LY_ERR err; LY_ERR err;
err = lyd_new_path(output, ly_native_ctx, xpath, value, 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); assert(err == LY_SUCCESS);
} }