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: 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
tests/test_scoped_lock.c
View File

@@ -199,8 +199,8 @@ AST_TEST_DEFINE(cleanup_order)
enum ast_test_result_state res = AST_TEST_PASS;
struct ao2_iterator iter;
struct test_struct *object_iter;
RAII_VAR(struct ao2_container*, container, ao2_container_alloc(13, NULL, NULL), ao2_cleanup);
RAII_VAR(struct test_struct *, object, ao2_alloc(sizeof(*object), NULL), ao2_cleanup);
RAII_VAR(struct ao2_container*, container, NULL, ao2_cleanup);
RAII_VAR(struct test_struct *, object, NULL, ao2_cleanup);
switch(cmd) {
case TEST_INIT:
@@ -216,6 +216,8 @@ AST_TEST_DEFINE(cleanup_order)
}
current_test = test;
container = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, 13, NULL, NULL, NULL);
object = ao2_alloc(sizeof(*object), NULL);
if (!object || !container) {
/* Allocation failure. We can't even pretend to do this test properly */
return AST_TEST_FAIL;