From 2d63e807ac56cad97bf32bec0e8372dc2bed240d Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sun, 2 Mar 2025 20:51:14 +0200 Subject: separate freeing and removing nodes --- include/conts/sptree.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/conts/sptree.h b/include/conts/sptree.h index 27dc2f7..bbb2281 100644 --- a/include/conts/sptree.h +++ b/include/conts/sptree.h @@ -393,6 +393,13 @@ static inline void SPTREE(remove_found)(struct SPROOT *s, SPTREE_TYPE *found) SPTREE(update)(s, paren); } +static inline void SPTREE(free_found)(struct SPROOT *s, SPTREE_TYPE *found) +{ + (void)s; /* unused */ + struct SPNODE *del = CONTAINER_OF(found, struct SPNODE, data); + free(del); +} + static inline void SPTREE(remove)(struct SPROOT *s, SPTREE_TYPE data) { SPTREE_TYPE *found = SPTREE(find)(s, data); @@ -400,8 +407,7 @@ static inline void SPTREE(remove)(struct SPROOT *s, SPTREE_TYPE data) return; SPTREE(remove_found)(s, found); - struct SPNODE *del = CONTAINER_OF(found, struct SPNODE, data); - free(del); + SPTREE(free_found)(s, found); } static inline void SPTREE(destroy)(struct SPROOT *s) -- cgit v1.2.3