]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: Fix LYD_NEW_PATH_OUTPUT issue to support libyang v3.x
authorLu.Mao <Lu.Mao@molex.com>
Thu, 1 Aug 2024 01:54:14 +0000 (09:54 +0800)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Mon, 9 Sep 2024 19:20:34 +0000 (19:20 +0000)
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)

lib/yang.c

index 44459df4a50a0936a46fdba7d366cc730436b7b6..6a8e5223a09cbf4e8978a5459a1d51d0786fb535 100644 (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, \
                             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);
 }