From: Renato Westphal <renato@opensourcerouting.org>
Date: Fri, 16 Nov 2018 13:13:48 +0000 (-0200)
Subject: lib: set YANG search directory when creating libyang context
X-Git-Tag: frr-7.1-dev~154^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f3e5b71cc1894cb0ca2b835d4e0902a0034e1948;p=matthieu%2Ffrr.git

lib: set YANG search directory when creating libyang context

Minor code simplification.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/lib/yang.c b/lib/yang.c
index a7a50a46b0..6236dc5a66 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -609,13 +609,13 @@ void yang_init(void)
 	ly_log_options(LY_LOLOG | LY_LOSTORE);
 
 	/* Initialize libyang container for native models. */
-	ly_native_ctx = ly_ctx_new(NULL, LY_CTX_DISABLE_SEARCHDIR_CWD);
+	ly_native_ctx =
+		ly_ctx_new(YANG_MODELS_PATH, LY_CTX_DISABLE_SEARCHDIR_CWD);
 	if (!ly_native_ctx) {
 		flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
 		exit(1);
 	}
 	ly_ctx_set_module_imp_clb(ly_native_ctx, yang_module_imp_clb, NULL);
-	ly_ctx_set_searchdir(ly_native_ctx, YANG_MODELS_PATH);
 	ly_ctx_set_priv_dup_clb(ly_native_ctx, ly_dup_cb);
 
 	/* Detect if the required libyang plugin(s) were loaded successfully. */
diff --git a/lib/yang_translator.c b/lib/yang_translator.c
index 27b92a0e6b..02da3ebd6a 100644
--- a/lib/yang_translator.c
+++ b/lib/yang_translator.c
@@ -162,12 +162,12 @@ struct yang_translator *yang_translator_load(const char *path)
 	RB_INSERT(yang_translators, &yang_translators, translator);
 
 	/* Initialize the translator libyang context. */
-	translator->ly_ctx = ly_ctx_new(NULL, LY_CTX_DISABLE_SEARCHDIR_CWD);
+	translator->ly_ctx =
+		ly_ctx_new(YANG_MODELS_PATH, LY_CTX_DISABLE_SEARCHDIR_CWD);
 	if (!translator->ly_ctx) {
 		flog_warn(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
 		goto error;
 	}
-	ly_ctx_set_searchdir(translator->ly_ctx, YANG_MODELS_PATH);
 
 	/* Load modules and deviations. */
 	set = lyd_find_path(dnode, "./module");
@@ -515,12 +515,12 @@ static void str_replace(char *o_string, const char *s_string,
 
 void yang_translator_init(void)
 {
-	ly_translator_ctx = ly_ctx_new(NULL, LY_CTX_DISABLE_SEARCHDIR_CWD);
+	ly_translator_ctx =
+		ly_ctx_new(YANG_MODELS_PATH, LY_CTX_DISABLE_SEARCHDIR_CWD);
 	if (!ly_translator_ctx) {
 		flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
 		exit(1);
 	}
-	ly_ctx_set_searchdir(ly_translator_ctx, YANG_MODELS_PATH);
 
 	if (!ly_ctx_load_module(ly_translator_ctx, "frr-module-translator",
 				NULL)) {