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

astobj2: Remove legacy ao2_container_alloc routine.

Browse Source 
Replace usage of ao2_container_alloc with ao2_container_alloc_hash or
ao2_container_alloc_list.  Remove ao2_container_alloc macro.

Change-Id: I0907d78bc66efc775672df37c8faad00f2f6c088
This commit is contained in:
Corey Farrell
2018-11-19 15:10:02 -05:00
parent b7af9c8b19
commit 021ce938ca
67 changed files with 315 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_phoneprov.c
View File

@@ -1413,13 +1413,15 @@ static int unload_module(void)
*/
static int load_module(void)
{
profiles = ao2_container_alloc(MAX_PROFILE_BUCKETS, phone_profile_hash_fn, phone_profile_cmp_fn);
profiles = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, MAX_PROFILE_BUCKETS,
phone_profile_hash_fn, NULL, phone_profile_cmp_fn);
if (!profiles) {
ast_log(LOG_ERROR, "Unable to allocate profiles container.\n");
return AST_MODULE_LOAD_DECLINE;
}
http_routes = ao2_container_alloc(MAX_ROUTE_BUCKETS, http_route_hash_fn, http_route_cmp_fn);
http_routes = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, MAX_ROUTE_BUCKETS,
http_route_hash_fn, NULL, http_route_cmp_fn);
if (!http_routes) {
ast_log(LOG_ERROR, "Unable to allocate routes container.\n");
goto error;
@@ -1430,13 +1432,15 @@ static int load_module(void)
goto error;
}
users = ao2_container_alloc(MAX_USER_BUCKETS, user_hash_fn, user_cmp_fn);
users = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, MAX_USER_BUCKETS,
user_hash_fn, NULL, user_cmp_fn);
if (!users) {
ast_log(LOG_ERROR, "Unable to allocate users container.\n");
goto error;
}
providers = ao2_container_alloc(MAX_PROVIDER_BUCKETS, phoneprov_provider_hash_fn, phoneprov_provider_cmp_fn);
providers = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
MAX_PROVIDER_BUCKETS, phoneprov_provider_hash_fn, NULL, phoneprov_provider_cmp_fn);
if (!providers) {
ast_log(LOG_ERROR, "Unable to allocate providers container.\n");
goto error;