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

This is basically a complete rollback of r155401, as it was determined that

Browse Source 
it would be best to maintain API compatibility.  Instead, this commit introduces
ao2_callback_data() which is functionally identical to ao2_callback() except
that it allows you to pass arbitrary data to the callback.

Reviewed by Mark Michelson via ReviewBoard:
	http://reviewboard.digium.com/r/64


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-11-25 01:01:49 +00:00
parent 69d85eaca9
commit fd8caa1778
16 changed files with 236 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
funcs/func_dialgroup.c
View File

@@ -96,7 +96,7 @@ static int group_hash_fn(const void *obj, const int flags)
return ast_str_hash(g->name);
}
static int group_cmp_fn(void *obj1, void *name2, void *data, int flags)
static int group_cmp_fn(void *obj1, void *name2, int flags)
{
struct group *g1 = obj1, *g2 = name2;
char *name = name2;
@@ -112,7 +112,7 @@ static int entry_hash_fn(const void *obj, const int flags)
return ast_str_hash(e->name);
}
static int entry_cmp_fn(void *obj1, void *name2, void *data, int flags)
static int entry_cmp_fn(void *obj1, void *name2, int flags)
{
struct group_entry *e1 = obj1, *e2 = name2;
char *name = name2;
@@ -125,7 +125,7 @@ static int entry_cmp_fn(void *obj1, void *name2, void *data, int flags)
static int dialgroup_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
{
struct ao2_iterator i;
struct group *grhead = ao2_find(group_container, data, NULL, 0);
struct group *grhead = ao2_find(group_container, data, 0);
struct group_entry *entry;
size_t bufused = 0;
int trunc_warning = 0;
@@ -206,7 +206,7 @@ static int dialgroup_write(struct ast_channel *chan, const char *cmd, char *data
AST_STANDARD_APP_ARGS(args, data);
AST_NONSTANDARD_APP_ARGS(inter, value, '&');
if (!(grhead = ao2_find(group_container, args.group, NULL, 0))) {
if (!(grhead = ao2_find(group_container, args.group, 0))) {
/* Create group */
grhead = ao2_alloc(sizeof(*grhead), group_destroy);
if (!grhead)
@@ -245,7 +245,7 @@ static int dialgroup_write(struct ast_channel *chan, const char *cmd, char *data
}
} else if (strncasecmp(args.op, "del", 3) == 0) {
for (j = 0; j < inter.argc; j++) {
if ((entry = ao2_find(grhead->entries, inter.faces[j], NULL, OBJ_UNLINK))) {
if ((entry = ao2_find(grhead->entries, inter.faces[j], OBJ_UNLINK))) {
ao2_ref(entry, -1);
} else {
ast_log(LOG_WARNING, "Interface '%s' not found in dialgroup '%s'\n", inter.faces[j], grhead->name);