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

1 files changed, 4 insertions, 4 deletions

diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index b9d295e1c..20999caf6 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -273,7 +273,7 @@ static struct pthread_timer *find_timer(int handle, int unlinkobj)
 		flags |= OBJ_UNLINK;
 	}
 
-	if (!(timer = ao2_find(pthread_timers, &tmp_timer, NULL, flags))) {
+	if (!(timer = ao2_find(pthread_timers, &tmp_timer, flags))) {
 		ast_assert(timer != NULL);
 		return NULL;
 	}
@@ -309,7 +309,7 @@ static int pthread_timer_hash(const void *obj, const int flags)
 /*!
  * \note only PIPE_READ is guaranteed valid 
  */
-static int pthread_timer_cmp(void *obj, void *arg, void *data, int flags)
+static int pthread_timer_cmp(void *obj, void *arg, int flags)
 {
 	struct pthread_timer *timer1 = obj, *timer2 = arg;
 
@@ -401,7 +401,7 @@ static void write_byte(int wr_fd)
 	} while (0);
 }
 
-static int run_timer(void *obj, void *arg, void *data, int flags)
+static int run_timer(void *obj, void *arg, int flags)
 {
 	struct pthread_timer *timer = obj;
 
@@ -427,7 +427,7 @@ static void *do_timing(void *arg)
 	while (!timing_thread.stop) {
 		struct timespec ts = { 0, };
 
-		ao2_callback(pthread_timers, OBJ_NODATA, run_timer, NULL, NULL);
+		ao2_callback(pthread_timers, OBJ_NODATA, run_timer, NULL);
 
 		next_wakeup = ast_tvadd(next_wakeup, ast_tv(0, 5000));