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

astobj2: Eliminate usage of legacy container allocation macros.

Browse Source 
These macros have been documented as legacy for a long time but are
still used in new code because they exist.  Remove all references to:
* ao2_container_alloc_options
* ao2_t_container_alloc_options
* ao2_t_container_alloc

These macro's are still available for use but only in modules.  Only
ao2_container_alloc remains due to it's use in over 100 places.

Change-Id: I1a26258b5bf3deb081aaeed11a0baa175c933c7a
This commit is contained in:
Corey Farrell
2018-10-16 15:06:15 -04:00
parent 14d1e6ca2a
commit dee1165d31
20 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
main/sorcery.c
View File

@@ -621,8 +621,8 @@ struct ast_sorcery *__ast_sorcery_open(const char *module_name, const char *file
goto failure_cleanup;
}
sorcery->types = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_RWLOCK, TYPE_BUCKETS,
ast_sorcery_object_type_hash_fn, ast_sorcery_object_type_cmp_fn);
sorcery->types = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_RWLOCK, 0, TYPE_BUCKETS,
ast_sorcery_object_type_hash_fn, NULL, ast_sorcery_object_type_cmp_fn);
if (!sorcery->types) {
goto failure_cleanup;
}
@@ -1792,7 +1792,8 @@ void *ast_sorcery_retrieve_by_fields(const struct ast_sorcery *sorcery, const ch
/* If returning multiple objects create a container to store them in */
if ((flags & AST_RETRIEVE_FLAG_MULTIPLE)) {
if (!(object = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, 1, NULL, NULL))) {
object = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_NOLOCK, 0, NULL, NULL);
if (!object) {
return NULL;
}
}
@@ -1836,7 +1837,12 @@ struct ao2_container *ast_sorcery_retrieve_by_regex(const struct ast_sorcery *so
struct ao2_container *objects;
int i;
if (!object_type || !(objects = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, 1, NULL, NULL))) {
if (!object_type) {
return NULL;
}
objects = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_NOLOCK, 0, NULL, NULL);
if (!objects) {
return NULL;
}
@@ -1866,7 +1872,12 @@ struct ao2_container *ast_sorcery_retrieve_by_prefix(const struct ast_sorcery *s
struct ao2_container *objects;
int i;
if (!object_type || !(objects = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, 1, NULL, NULL))) {
if (!object_type) {
return NULL;
}
objects = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_NOLOCK, 0, NULL, NULL);
if (!objects) {
return NULL;
}