kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +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 15:10:15 -05:00
parent 0e096aefac
commit ed7a5664b6
67 changed files with 321 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/message.c
View File

@@ -367,12 +367,6 @@ static void msg_ds_destroy(void *data)
ao2_ref(msg, -1);
}
static int msg_data_hash_fn(const void *obj, const int flags)
{
const struct msg_data *data = obj;
return ast_str_case_hash(data->name);
}
static int msg_data_cmp_fn(void *obj, void *arg, int flags)
{
const struct msg_data *one = obj, *two = arg;
@@ -406,7 +400,9 @@ struct ast_msg *ast_msg_alloc(void)
return NULL;
}
if (!(msg->vars = ao2_container_alloc(1, msg_data_hash_fn, msg_data_cmp_fn))) {
msg->vars = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NULL, msg_data_cmp_fn);
if (!msg->vars) {
ao2_ref(msg, -1);
return NULL;
}