Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / yang_wrappers.c

diff --git a/lib/yang_wrappers.c b/lib/yang_wrappers.c
index ea21d1324bd35c57e409803896788b2897171b78..dc049a374a9e47ad19ec19e917f61af27d45c64e 100644 (file)
--- a/lib/yang_wrappers.c
+++ b/lib/yang_wrappers.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018  NetDEF, Inc.
  *                     Renato Westphal
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -58,6 +45,7 @@
                }                                                              \
        } while (0)
 
+PRINTFRR(2, 0)
 static inline const char *
 yang_dnode_xpath_get_canon(const struct lyd_node *dnode, const char *xpath_fmt,
                           va_list ap)
@@ -75,6 +63,7 @@ yang_dnode_xpath_get_canon(const struct lyd_node *dnode, const char *xpath_fmt,
        return lyd_get_value(&__dleaf->node);
 }
 
+PRINTFRR(2, 0)
 static inline const struct lyd_value *
 yang_dnode_xpath_get_value(const struct lyd_node *dnode, const char *xpath_fmt,
                           va_list ap)
@@ -100,7 +89,7 @@ static const char *yang_get_default_value(const char *xpath)
        const struct lysc_node *snode;
        const char *value;
 
-       snode = lys_find_path(ly_native_ctx, NULL, xpath, 0);
+       snode = yang_find_snode(ly_native_ctx, xpath, 0);
        if (snode == NULL) {
                flog_err(EC_LIB_YANG_UNKNOWN_DATA_PATH,
                         "%s: unknown data path: %s", __func__, xpath);
@@ -217,7 +206,7 @@ int yang_str2enum(const char *xpath, const char *value)
        const struct lysc_type_enum *type;
        const struct lysc_type_bitenum_item *enums;
 
-       snode = lys_find_path(ly_native_ctx, NULL, xpath, 0);
+       snode = yang_find_snode(ly_native_ctx, xpath, 0);
        if (snode == NULL) {
                flog_err(EC_LIB_YANG_UNKNOWN_DATA_PATH,
                         "%s: unknown data path: %s", __func__, xpath);
@@ -252,7 +241,7 @@ struct yang_data *yang_data_new_enum(const char *xpath, int value)
        const struct lysc_type_enum *type;
        const struct lysc_type_bitenum_item *enums;
 
-       snode = lys_find_path(ly_native_ctx, NULL, xpath, 0);
+       snode = yang_find_snode(ly_native_ctx, xpath, 0);
        if (snode == NULL) {
                flog_err(EC_LIB_YANG_UNKNOWN_DATA_PATH,
                         "%s: unknown data path: %s", __func__, xpath);