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

Merge "astobj2: Eliminate usage of legacy container allocation macros." into 16

Browse Source
This commit is contained in:
George Joseph
2018-10-24 08:30:56 -05:00
committed by Gerrit Code Review
parent 891a270275 dee1165d31
commit 4eef448acc
20 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk/astobj2.h
View File

@@ -1298,6 +1298,7 @@ typedef int (ao2_sort_fn)(const void *obj_left, const void *obj_right, int flags
struct ao2_container;
/*!
* \deprecated
* \brief Allocate and initialize a hash container with the desired number of buckets.
*
* \details
@@ -1315,16 +1316,20 @@ struct ao2_container;
* \note Destructor is set implicitly.
* \note This is legacy container creation that is mapped to the new method.
*/
#define ao2_container_alloc(n_buckets, hash_fn, cmp_fn) \
ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, (n_buckets), (hash_fn), NULL, (cmp_fn))
#ifndef AST_IN_CORE
/* These macros are removed from Asterisk 17. They are still available to modules
* but should only be used by third party modules that have not been updated. */
#define ao2_t_container_alloc_options(options, n_buckets, hash_fn, cmp_fn, tag) \
ao2_t_container_alloc_hash((options), 0, (n_buckets), (hash_fn), NULL, (cmp_fn), (tag))
#define ao2_container_alloc_options(options, n_buckets, hash_fn, cmp_fn) \
ao2_container_alloc_hash((options), 0, (n_buckets), (hash_fn), NULL, (cmp_fn))
#define ao2_t_container_alloc(n_buckets, hash_fn, cmp_fn, tag) \
ao2_t_container_alloc_options(AO2_ALLOC_OPT_LOCK_MUTEX, (n_buckets), (hash_fn), (cmp_fn), (tag))
#define ao2_container_alloc(n_buckets, hash_fn, cmp_fn) \
ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_MUTEX, (n_buckets), (hash_fn), (cmp_fn))
ao2_t_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, (n_buckets), (hash_fn), NULL, (cmp_fn), (tag))
#endif
/*!
* \brief Allocate and initialize a hash container with the desired number of buckets.