diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 01:01:49 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 01:01:49 +0000 |
| commit | 3ce5f8f4ee27228b26f6d39d9e1cf75f439995a7 (patch) | |
| tree | 6af2cfc1b0ec46aa179c5019f00274f1eba84fce /res/res_timing_timerfd.c | |
| parent | 7bf3c44abe26f6ce1dc917c33e5ed4a98e80776d (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: http://svn.digium.com/svn/asterisk/trunk@158959 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_timing_timerfd.c')
| -rw-r--r-- | res/res_timing_timerfd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c index d79b63d38..d0ad17520 100644 --- a/res/res_timing_timerfd.c +++ b/res/res_timing_timerfd.c @@ -80,7 +80,7 @@ static int timerfd_timer_hash(const void *obj, const int flags) return timer->handle; } -static int timerfd_timer_cmp(void *obj, void *args, void *data, int flags) +static int timerfd_timer_cmp(void *obj, void *args, int flags) { struct timerfd_timer *timer1 = obj, *timer2 = args; return timer1->handle == timer2->handle ? CMP_MATCH | CMP_STOP : 0; @@ -120,7 +120,7 @@ static void timerfd_timer_close(int handle) .handle = handle, }; - if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) { + if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) { ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return; } @@ -172,7 +172,7 @@ static int timerfd_timer_enable_continuous(int handle) .handle = handle, }; - if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) { + if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) { ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } @@ -198,7 +198,7 @@ static int timerfd_timer_disable_continuous(int handle) .handle = handle, }; - if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) { + if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) { ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } @@ -225,7 +225,7 @@ static enum ast_timing_event timerfd_timer_get_event(int handle) .handle = handle, }; - if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) { + if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) { ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } |