From 9555e71d9887d0d5caf87341dc47d9ad313bb609 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sun, 19 May 2019 01:22:04 +0200 Subject: Add plist_array_item_remove() to allow removing an array's child node without relying on the index --- include/plist/plist.h | 8 ++++++++ src/plist.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/plist/plist.h b/include/plist/plist.h index 63e9d84..bba735d 100644 --- a/include/plist/plist.h +++ b/include/plist/plist.h @@ -287,6 +287,14 @@ extern "C" */ void plist_array_remove_item(plist_t node, uint32_t n); + /** + * Remove a node that is a child node of a #PLIST_ARRAY node. + * node will be freed using #plist_free. + * + * @param node The node to be removed from its #PLIST_ARRAY parent. + */ + void plist_array_item_remove(plist_t node); + /** * Create an iterator of a #PLIST_ARRAY node. * The allocated iterator should be freed with the standard free function. diff --git a/src/plist.c b/src/plist.c index 3ffedc4..dd659b8 100644 --- a/src/plist.c +++ b/src/plist.c @@ -515,6 +515,21 @@ PLIST_API void plist_array_remove_item(plist_t node, uint32_t n) return; } +PLIST_API void plist_array_item_remove(plist_t node) +{ + plist_t father = plist_get_parent(node); + if (PLIST_ARRAY == plist_get_node_type(father)) + { + int n = node_child_position(father, node); + if (n < 0) return; + ptrarray_t* pa = ((plist_data_t)((node_t*)father)->data)->hashtable; + if (pa) { + ptr_array_remove(pa, n); + } + plist_free(node); + } +} + PLIST_API void plist_array_new_iter(plist_t node, plist_array_iter *iter) { if (iter) -- cgit v1.1-32-gdbae