summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-10-02 16:28:03 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-10-02 16:28:03 -0500
commit45bba81f67db01d7c4cabd7e129001214ff53599 (patch)
treefefade5de1270826d6482507f36867eac48157d2
parent40bc805b0da671e16690af5b1857454b0af0baab (diff)
parent9c1ca287a485f57cfd1d7c0c9b3d262c7fb222aa (diff)
Merge "res_sorcery_memory_cache.c: Replace inline code with function."
-rw-r--r--res/res_sorcery_memory_cache.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c
index 53fa3b963..fa142fc88 100644
--- a/res/res_sorcery_memory_cache.c
+++ b/res/res_sorcery_memory_cache.c
@@ -1063,9 +1063,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);
}