kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

astobj2: Eliminate usage of legacy container allocation macros.

Browse Source 
These macros have been documented as legacy for a long time but are
still used in new code because they exist.  Remove all references to:
* ao2_container_alloc_options
* ao2_t_container_alloc_options
* ao2_t_container_alloc

These macro's are still available for use but only in modules.  Only
ao2_container_alloc remains due to it's use in over 100 places.

Change-Id: I1a26258b5bf3deb081aaeed11a0baa175c933c7a
This commit is contained in:
Corey Farrell
2018-10-16 15:00:27 -04:00
parent b7cb2c90e6
commit 54a1fbe428
19 changed files with 82 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_sorcery_memory_cache.c
View File

@@ -1556,9 +1556,9 @@ static void *sorcery_memory_cache_open(const char *data)
}
}
cache->objects = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_RWLOCK,
cache->objects = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_RWLOCK, 0,
cache->maximum_objects ? cache->maximum_objects : CACHE_CONTAINER_BUCKET_SIZE,
sorcery_memory_cached_object_hash, sorcery_memory_cached_object_cmp);
sorcery_memory_cached_object_hash, NULL, sorcery_memory_cached_object_cmp);
if (!cache->objects) {
ast_log(LOG_ERROR, "Could not create a container to hold cached objects for memory cache\n");
return NULL;