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: 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

8
res/res_config_sqlite3.c
View File

@@ -1194,7 +1194,9 @@ static int realtime_sqlite3_require(const char *database, const char *table, va_
return -1;
}
if (!(columns = ao2_container_alloc(31, str_hash_fn, str_cmp_fn))) {
columns = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, 31,
str_hash_fn, NULL, str_cmp_fn);
if (!columns) {
unref_db(&db);
return -1;
}
@@ -1369,7 +1371,9 @@ static int load_module(void)
{
discover_sqlite3_caps();
if (!((databases = ao2_container_alloc(DB_BUCKETS, db_hash_fn, db_cmp_fn)))) {
databases = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, DB_BUCKETS,
db_hash_fn, NULL, db_cmp_fn);
if (!databases) {
return AST_MODULE_LOAD_DECLINE;
}