kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 03:07:59 +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

6
main/media_index.c
View File

@@ -121,7 +121,8 @@ static struct media_info *media_info_alloc(const char *name)
memcpy(info->name, name, name_sz);
info->variants = ao2_container_alloc(VARIANT_BUCKETS, media_variant_hash, media_variant_cmp);
info->variants = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
VARIANT_BUCKETS, media_variant_hash, NULL, media_variant_cmp);
if (!info->variants) {
ao2_ref(info, -1);
@@ -169,7 +170,8 @@ struct ast_media_index *ast_media_index_create(const char *base_dir)
memcpy(index->base_dir, base_dir, base_dir_sz);
index->index = ao2_container_alloc(INDEX_BUCKETS, media_info_hash, media_info_cmp);
index->index = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, INDEX_BUCKETS,
media_info_hash, NULL, media_info_cmp);
if (!index->index) {
ao2_ref(index, -1);