commit 820d2263c2beca8deece1f96c23e423183b3c015
author Radek Krejci <rkrejci@cesnet.cz> Thu Sep 20 12:15:31 2018 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Sep 20 12:16:37 2018 +0200
tree bc9651e25b0e252cae7e5115e6cb400b4f0e3784
parent cd649071d8e2442f59c3cf4c692279cf9f63caa6

set CHANGE add optional destructor function as parameter of ly_set_rm* functions

src/context.c

diff --git a/src/context.c b/src/context.c
index 565ee91..45be465 100644
--- a/src/context.c
+++ b/src/context.c
@@ -141,7 +141,7 @@
 
     if (index >= 0) {
         /* remove specific search directory */
-        return ly_set_rm_index(&ctx->search_paths, index);
+        return ly_set_rm_index(&ctx->search_paths, index, free);
     } else {
         /* remove them all */
         ly_set_erase(&ctx->search_paths, free);

src/set.c

diff --git a/src/set.c b/src/set.c
index 7cfda31..7e567eb 100644
--- a/src/set.c
+++ b/src/set.c
@@ -162,11 +162,14 @@
 }
 
 API LY_ERR
-ly_set_rm_index(struct ly_set *set, unsigned int index)
+ly_set_rm_index(struct ly_set *set, unsigned int index, void (*destructor)(void *obj))
 {
     LY_CHECK_ARG_RET(NULL, set, LY_EINVAL);
-    LY_CHECK_ERR_RET(((index + 1) > set->count), LOGARG(NULL, index), LY_EINVAL);
+    LY_CHECK_ERR_RET(index >= set->count, LOGARG(NULL, index), LY_EINVAL);
 
+    if (destructor) {
+        destructor(set->objs[index]);
+    }
     if (index == set->count - 1) {
         /* removing last item in set */
         set->objs[index] = NULL;
@@ -181,7 +184,7 @@
 }
 
 API LY_ERR
-ly_set_rm(struct ly_set *set, void *object)
+ly_set_rm(struct ly_set *set, void *object, void (*destructor)(void *obj))
 {
     unsigned int i;
 
@@ -195,6 +198,6 @@
     }
     LY_CHECK_ERR_RET((i == set->count), LOGARG(NULL, object), LY_EINVAL); /* object is not in set */
 
-    return ly_set_rm_index(set, i);
+    return ly_set_rm_index(set, i, destructor);
 }
 

src/set.h

diff --git a/src/set.h b/src/set.h
index e226a5c..5834b8c 100644
--- a/src/set.h
+++ b/src/set.h
@@ -130,9 +130,10 @@
  *
  * @param[in] set Set from which the \p node will be removed.
  * @param[in] obejct The object to be removed from the \p set.
+ * @param[in] destructor Optional function to free the objects being removed.
  * @return LY_ERR return value.
  */
-LY_ERR ly_set_rm(struct ly_set *set, void *object);
+LY_ERR ly_set_rm(struct ly_set *set, void *object, void (*destructor)(void *obj));
 
 /**
  * @brief Remove an object on the specific set index.
@@ -142,9 +143,10 @@
  *
  * @param[in] set Set from which a node will be removed.
  * @param[in] index Index of the object to remove in the \p set.
+ * @param[in] destructor Optional function to free the objects being removed.
  * @return LY_ERR return value.
  */
-LY_ERR ly_set_rm_index(struct ly_set *set, unsigned int index);
+LY_ERR ly_set_rm_index(struct ly_set *set, unsigned int index, void (*destructor)(void *obj));
 
 /**
  * @brief Free the ::ly_set data. If the destructor is not provided, it frees only the set structure