schema: use lys_data_path_pattern

rjarry · rjarry · commit b4d66980f990 · 2020-06-30T13:11:21.000+02:00
This function has been added to libyang.so. Use it instead of a local one. Link: CESNET/libyang@c831064cb7589ff7 Signed-off-by: Robin Jarry <robin@jarry.cc>
diff --git a/cffi/cdefs.h b/cffi/cdefs.h
@@ -344,6 +344,7 @@ const struct lys_node_list *lys_is_key(const struct lys_node_leaf *, uint8_t *);
 const struct lys_node *lys_getnext(const struct lys_node *, const struct lys_node *, const struct lys_module *, int);
 char *lys_data_path(const struct lys_node *);
 char *lys_path(const struct lys_node *, int);
+char *lys_data_path_pattern(const struct lys_node *, const char *);
 struct lys_module *lys_node_module(const struct lys_node *);
 struct lys_module *lys_main_module(const struct lys_module *);
 struct lys_node *lys_parent(const struct lys_node *);
@@ -447,7 +448,6 @@ void free(void *);
 const struct lys_ext_instance *lypy_find_ext(
 	const struct lys_ext_instance **, uint8_t,
 	const char *, const char *, const char *);
-char *lypy_data_path_pattern(const struct lys_node *);
 char *lypy_node_fullname(const struct lys_node *);
 int lyd_toprint(const struct lyd_node *node, int options);
 uint8_t lypy_module_implemented(const struct lys_module *);
diff --git a/cffi/source.c b/cffi/source.c
@@ -40,68 +40,6 @@ lypy_find_ext(const struct lys_ext_instance **ext, uint8_t ext_size,
 	return NULL;
 }
 
-static char *lypy_data_path_pattern(const struct lys_node *node)
-{
-	const struct lys_module *prev_mod, *mod;
-	char *xpath = NULL, *keys = NULL;
-	struct ly_set *set = NULL;;
-	size_t x;
-
-	if (!node)
-		goto cleanup;
-
-	set = ly_set_new();
-	if (!set)
-		goto cleanup;
-
-	while (node) {
-		ly_set_add(set, (void *)node, 0);
-		do {
-			node = lys_parent(node);
-		} while (node && !(node->nodetype & (
-			LYS_CONTAINER | LYS_LIST | LYS_RPC)));
-	}
-
-	xpath = malloc(2048);
-	if (!xpath)
-		goto cleanup;
-	keys = malloc(512);
-	if (!keys)
-		goto cleanup;
-
-	x = 0;
-	xpath[0] = '\0';
-
-	prev_mod = NULL;
-	for (int i = set->number - 1; i > -1; --i) {
-		size_t k = 0;
-		keys[0] = '\0';
-		node = set->set.s[i];
-		if (node->nodetype == LYS_LIST) {
-			const struct lys_node_list *list;
-			list = (const struct lys_node_list *)node;
-			for (uint8_t j = 0; j < list->keys_size; j++) {
-				k += sprintf(keys + k, "[%s='%%s']",
-					list->keys[j]->name);
-			}
-		}
-
-		mod = lys_node_module(node);
-		if (mod && mod != prev_mod) {
-			prev_mod = mod;
-			x += sprintf(xpath + x, "/%s:%s%s",
-				mod->name, node->name, keys);
-		} else {
-			x += sprintf(xpath + x, "/%s%s", node->name, keys);
-		}
-	}
-
-cleanup:
-	ly_set_free(set);
-	free(keys);
-	return xpath;
-}
-
 static char *lypy_node_fullname(const struct lys_node *node)
 {
 	const struct lys_module *module;
diff --git a/libyang/schema.py b/libyang/schema.py
@@ -682,9 +682,9 @@ def schema_path(self):
         finally:
             lib.free(s)
 
-    def data_path(self):
+    def data_path(self, key_placeholder="'%s'"):
         try:
-            s = lib.lypy_data_path_pattern(self._node)
+            s = lib.lys_data_path_pattern(self._node, str2c(key_placeholder))
             return c2str(s)
         finally:
             lib.free(s)
