From dfeb513e85d13550d81b40df5e95333c1ad5c61c Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 1 Oct 2015 14:30:06 -0500 Subject: res_sorcery_memory_cache.c: Replace inline code with function. Make sorcery_memory_cache_close() call remove_all_from_cache() instead of partially inlining it. ASTERISK-25441 Change-Id: I1aa6cb425b1a4307096f3f914d17af8ec179a74c --- res/res_sorcery_memory_cache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'res/res_sorcery_memory_cache.c') diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c index bc385b4ae..7c7d5708e 100644 --- a/res/res_sorcery_memory_cache.c +++ b/res/res_sorcery_memory_cache.c @@ -1061,9 +1061,7 @@ static void sorcery_memory_cache_close(void *data) * a prolonged period of time. */ ao2_wrlock(cache->objects); - ao2_callback(cache->objects, OBJ_UNLINK | OBJ_NOLOCK | OBJ_NODATA | OBJ_MULTIPLE, - NULL, NULL); - AST_SCHED_DEL_UNREF(sched, cache->expire_id, ao2_ref(cache, -1)); + remove_all_from_cache(cache); ao2_unlock(cache->objects); } -- cgit v1.2.3