kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to pass arbitrary data to the ao2_callback_fn (called from

Browse Source 
ao2_callback and ao2_find).  Currently, passing OBJ_POINTER to either
of these mandates that the passed 'arg' is a hashable object, making
searching for an ao2 object based on outside criteria difficult.

Reviewed by Russell and Mark M. via ReviewBoard:
    http://reviewboard.digium.com/r/36/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@155401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-11-07 22:39:30 +00:00
parent bd3f685f20
commit 30d1744ffc
14 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_console.c
View File

@@ -251,7 +251,7 @@ static struct console_pvt *find_pvt(const char *name)
.name = name,
};
return ao2_find(pvts, &tmp_pvt, OBJ_POINTER);
return ao2_find(pvts, &tmp_pvt, NULL, OBJ_POINTER);
}
/*!
@@ -1351,7 +1351,7 @@ static void build_device(struct ast_config *cfg, const char *name)
unref_pvt(pvt);
}
static int pvt_mark_destroy_cb(void *obj, void *arg, int flags)
static int pvt_mark_destroy_cb(void *obj, void *arg, void *data, int flags)
{
struct console_pvt *pvt = obj;
pvt->destroy = 1;
@@ -1403,7 +1403,7 @@ static int load_config(int reload)
return -1;
}
ao2_callback(pvts, OBJ_NODATA, pvt_mark_destroy_cb, NULL);
ao2_callback(pvts, OBJ_NODATA, pvt_mark_destroy_cb, NULL, NULL);
ast_mutex_lock(&globals_lock);
for (v = ast_variable_browse(cfg, "general"); v; v = v->next)
@@ -1429,7 +1429,7 @@ static int pvt_hash_cb(const void *obj, const int flags)
return ast_str_hash(pvt->name);
}
static int pvt_cmp_cb(void *obj, void *arg, int flags)
static int pvt_cmp_cb(void *obj, void *arg, void *data, int flags)
{
struct console_pvt *pvt = obj, *pvt2 = arg;