diff options
| author | Sean Bright <sean@malleable.com> | 2008-11-25 01:01:49 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-11-25 01:01:49 +0000 |
| commit | fd8caa1778e486b26badd4691ad50447c1f08631 (patch) | |
| tree | 6af2cfc1b0ec46aa179c5019f00274f1eba84fce /channels/chan_console.c | |
| parent | 69d85eaca9e8636c2af2dd9bd29e61d027d55c2c (diff) | |
This is basically a complete rollback of r155401, as it was determined that
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
Diffstat (limited to 'channels/chan_console.c')
| -rw-r--r-- | channels/chan_console.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_console.c b/channels/chan_console.c index b9f5c5471..ee26f2195 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -251,7 +251,7 @@ static struct console_pvt *find_pvt(const char *name) .name = name, }; - return ao2_find(pvts, &tmp_pvt, NULL, OBJ_POINTER); + return ao2_find(pvts, &tmp_pvt, 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, void *data, int flags) +static int pvt_mark_destroy_cb(void *obj, void *arg, 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, NULL); + ao2_callback(pvts, OBJ_NODATA, pvt_mark_destroy_cb, 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_case_hash(pvt->name); } -static int pvt_cmp_cb(void *obj, void *arg, void *data, int flags) +static int pvt_cmp_cb(void *obj, void *arg, int flags) { struct console_pvt *pvt = obj, *pvt2 = arg; |