diff options
| -rw-r--r-- | include/asterisk/astobj2.h | 8 | ||||
| -rw-r--r-- | main/astobj2.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index a8254c6e4..040f6726a 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -685,9 +685,9 @@ struct ao2_container; #define ao2_t_container_alloc(arg1,arg2,arg3,arg4) _ao2_container_alloc((arg1), (arg2), (arg3)) #define ao2_container_alloc(arg1,arg2,arg3) _ao2_container_alloc((arg1), (arg2), (arg3)) #endif -struct ao2_container *_ao2_container_alloc(const uint n_buckets, +struct ao2_container *_ao2_container_alloc(const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn); -struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, +struct ao2_container *_ao2_container_alloc_debug(const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn, char *tag, char *file, int line, const char *funcname); @@ -983,11 +983,11 @@ struct ao2_iterator { /*! current bucket */ int bucket; /*! container version */ - uint c_version; + unsigned int c_version; /*! pointer to the current object */ void *obj; /*! container version when the object was created */ - uint version; + unsigned int version; }; /* the flags field can contain F_AO2I_DONTLOCK, which will prevent diff --git a/main/astobj2.c b/main/astobj2.c index 02f643c81..9d3067922 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -409,7 +409,7 @@ static int hash_zero(const void *user_obj, const int flags) /* * A container is just an object, after all! */ -static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const uint n_buckets, ao2_hash_fn *hash_fn, +static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn) { /* XXX maybe consistency check on arguments ? */ @@ -430,7 +430,7 @@ static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, cons return c; } -struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, ao2_hash_fn *hash_fn, +struct ao2_container *_ao2_container_alloc_debug(const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn, char *tag, char *file, int line, const char *funcname) { /* XXX maybe consistency check on arguments ? */ @@ -442,7 +442,7 @@ struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, ao2_hash_ } struct ao2_container * -_ao2_container_alloc(const uint n_buckets, ao2_hash_fn *hash_fn, +_ao2_container_alloc(const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn) { /* XXX maybe consistency check on arguments ? */ |