kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

astobj2: Eliminate usage of legacy ao2_container_alloc routine.

Browse Source 
Replace usage of ao2_container_alloc with ao2_container_alloc_hash or
ao2_container_alloc_list.

ao2_container_alloc is now restricted to modules only and is being
removed from Asterisk 17.

Change-Id: I0907d78bc66efc775672df37c8faad00f2f6c088
This commit is contained in:
Corey Farrell
2018-11-19 11:20:21 -05:00
parent 78dbbcef65
commit 0a9904e1c6
65 changed files with 330 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/confbridge/conf_config_parser.c
View File

@@ -1822,15 +1822,21 @@ void *confbridge_cfg_alloc(void)
return NULL;
}
if (!(cfg->user_profiles = ao2_container_alloc(283, user_hash_cb, user_cmp_cb))) {
cfg->user_profiles = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, 283,
user_hash_cb, NULL, user_cmp_cb);
if (!cfg->user_profiles) {
goto error;
}
if (!(cfg->bridge_profiles = ao2_container_alloc(283, bridge_hash_cb, bridge_cmp_cb))) {
cfg->bridge_profiles = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, 283,
bridge_hash_cb, NULL, bridge_cmp_cb);
if (!cfg->bridge_profiles) {
goto error;
}
if (!(cfg->menus = ao2_container_alloc(283, menu_hash_cb, menu_cmp_cb))) {
cfg->menus = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, 283,
menu_hash_cb, NULL, menu_cmp_cb);
if (!cfg->menus) {
goto error;
}