commit cdeee43d4ffcaff87cd590fa8da1bc0ce8cbb85c
author Michal Vasko <mvasko@cesnet.cz> Fri Jan 13 13:51:01 2017 +0100
committer Michal Vasko <mvasko@cesnet.cz> Fri Jan 13 13:51:01 2017 +0100
tree 0f5b5d8305da9783e3544fb9b775527c7b13c6a7
parent 1dc0d12f54d686e1fba309ac6856b1fc34138387

client session CHANGE libyang func renamed

src/session_client.c

diff --git a/src/session_client.c b/src/session_client.c
index 030964d..6c7207e 100644
--- a/src/session_client.c
+++ b/src/session_client.c
@@ -289,7 +289,7 @@
 {
     const char *module_cpblt;
     int i, get_schema_support = 0, ret = 0, r;
-    ly_module_clb old_clb = NULL;
+    ly_module_imp_clb old_clb = NULL;
     void *old_data = NULL;
 
     assert(session->opts.client.cpblts && session->ctx);
@@ -306,8 +306,8 @@
     if (get_schema_support && !ly_ctx_get_module(session->ctx, "ietf-netconf-monitoring", NULL)) {
         if (lys_parse_path(session->ctx, SCHEMAS_DIR"/ietf-netconf-monitoring.yin", LYS_IN_YIN)) {
             /* set module retrieval using <get-schema> */
-            old_clb = ly_ctx_get_module_clb(session->ctx, &old_data);
-            ly_ctx_set_module_clb(session->ctx, libyang_module_clb, session);
+            old_clb = ly_ctx_get_module_imp_clb(session->ctx, &old_data);
+            ly_ctx_set_module_imp_clb(session->ctx, libyang_module_clb, session);
         } else {
             WRN("Loading NETCONF monitoring schema failed, cannot use <get-schema>.");
         }
@@ -316,7 +316,7 @@
     /* load base model disregarding whether it's in capabilities (but NETCONF capabilities are used to enable features) */
     if (ctx_check_and_load_ietf_netconf(session->ctx, session->opts.client.cpblts)) {
         if (old_clb) {
-            ly_ctx_set_module_clb(session->ctx, old_clb, old_data);
+            ly_ctx_set_module_imp_clb(session->ctx, old_clb, old_data);
         }
         return -1;
     }
@@ -338,7 +338,7 @@
                 if (get_schema_support) {
                     VRB("Trying to load the schema from a different source.");
                     /* works even if old_clb is NULL */
-                    ly_ctx_set_module_clb(session->ctx, old_clb, old_data);
+                    ly_ctx_set_module_imp_clb(session->ctx, old_clb, old_data);
                     r = ctx_check_and_load_model(session, module_cpblt);
                 }
 
@@ -348,13 +348,13 @@
                 }
 
                 /* set get-schema callback back */
-                ly_ctx_set_module_clb(session->ctx, &libyang_module_clb, session);
+                ly_ctx_set_module_imp_clb(session->ctx, &libyang_module_clb, session);
             }
         }
     }
 
     if (old_clb) {
-        ly_ctx_set_module_clb(session->ctx, old_clb, old_data);
+        ly_ctx_set_module_imp_clb(session->ctx, old_clb, old_data);
     }
     if (session->flags & NC_SESSION_CLIENT_NOT_STRICT) {
         WRN("Some models failed to be loaded, any data from these models (and any other unknown) will be ignored.");