kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the typedefs on ao2_container and ao2_iterator. This is simply because

Browse Source 
we don't typedef objects anywhere else in Asterisk, so we might as well make
this follow the same convention.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-09-04 18:37:44 +00:00
parent 0e39aced3c
commit c95389856a
3 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/asterisk/astobj2.h
View File

@@ -87,7 +87,7 @@ parameters. At the moment, this is done as follows:
<b>Sample Usage:</b>
\code
ao2_container *c;
struct ao2_container *c;
c = ao2_container_alloc(MAX_BUCKETS, my_hash_fn, my_cmp_fn);
@@ -239,8 +239,8 @@ Operations on container include:
iterate on a container
this is done with the following sequence
ao2_container *c = ... // our container
ao2_iterator i;
struct ao2_container *c = ... // our container
struct ao2_iterator i;
void *o;
i = ao2_iterator_init(c, flags);
@@ -320,14 +320,7 @@ typedef int (*ao2_callback_fn)(void *obj, void *arg, int flags);
/*!
* Here start declarations of containers.
*/
/*!
* This structure contains the total number of buckets
* and variable size array of object pointers.
* It is opaque, defined in astobj2.c, so we only need
* a type declaration.
*/
typedef struct __ao2_container ao2_container;
struct ao2_container;
/*!
* Allocate and initialize a container
@@ -343,13 +336,13 @@ typedef struct __ao2_container ao2_container;
*
* destructor is set implicitly.
*/
ao2_container *ao2_container_alloc(const uint n_buckets,
struct ao2_container *ao2_container_alloc(const uint n_buckets,
ao2_hash_fn hash_fn, ao2_callback_fn cmp_fn);
/*!
* Returns the number of elements in a container.
*/
int ao2_container_count(ao2_container *c);
int ao2_container_count(struct ao2_container *c);
/*
* Here we have functions to manage objects.
@@ -375,8 +368,8 @@ int ao2_container_count(ao2_container *c);
* matching behavior doesn't change.
*/
#define ao2_link(c, o) __ao2_link(c, o, 0)
void *__ao2_link(ao2_container *c, void *newobj, int iax2_hack);
void *ao2_unlink(ao2_container *c, void *newobj);
void *__ao2_link(struct ao2_container *c, void *newobj, int iax2_hack);
void *ao2_unlink(struct ao2_container *c, void *newobj);
/*! \struct Used as return value if the flag OBJ_MULTIPLE is set */
struct ao2_list {
@@ -432,8 +425,8 @@ struct ao2_list {
* be used to free the additional reference possibly created by this function.
*/
/* XXX order of arguments to find */
void *ao2_find(ao2_container *c, void *arg, enum search_flags flags);
void *ao2_callback(ao2_container *c,
void *ao2_find(struct ao2_container *c, void *arg, enum search_flags flags);
void *ao2_callback(struct ao2_container *c,
enum search_flags flags,
ao2_callback_fn cb_fn, void *arg);
@@ -472,8 +465,8 @@ int ao2_match_by_addr(void *user_data, void *arg, int flags);
*
* \code
*
* ao2_container *c = ... // the container we want to iterate on
* ao2_iterator i;
* struct ao2_container *c = ... // the container we want to iterate on
* struct ao2_iterator i;
* struct my_obj *o;
*
* i = ao2_iterator_init(c, flags);
@@ -510,9 +503,9 @@ int ao2_match_by_addr(void *user_data, void *arg, int flags);
* A freshly-initialized iterator has bucket=0, version = 0.
*/
struct __ao2_iterator {
struct ao2_iterator {
/*! the container */
ao2_container *c;
struct ao2_container *c;
/*! operation flags */
int flags;
#define F_AO2I_DONTLOCK 1 /*!< don't lock when iterating */
@@ -524,11 +517,10 @@ struct __ao2_iterator {
void *obj;
/*! container version when the object was created */
uint version;
};
typedef struct __ao2_iterator ao2_iterator;
};
ao2_iterator ao2_iterator_init(ao2_container *c, int flags);
struct ao2_iterator ao2_iterator_init(struct ao2_container *c, int flags);
void *ao2_iterator_next(ao2_iterator *a);
void *ao2_iterator_next(struct ao2_iterator *a);
#endif /* _ASTERISK_ASTOBJ2_H */