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

1 files changed, 3 insertions, 3 deletions

diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 6fad190f2..954830410 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -93,7 +93,7 @@ AST_MUTEX_DEFINE_STATIC(cli_ping_cond_lock);
 /*! \brief The astobj2 hash callback for taskprocessors */
 static int tps_hash_cb(const void *obj, const int flags);
 /*! \brief The astobj2 compare callback for taskprocessors */
-static int tps_cmp_cb(void *obj, void *arg, void *data, int flags);
+static int tps_cmp_cb(void *obj, void *arg, int flags);
 
 /*! \brief The task processing function executed by a taskprocessor */
 static void *tps_processing_function(void *data);
@@ -335,7 +335,7 @@ static int tps_hash_cb(const void *obj, const int flags)
 }
 
 /* compare callback for astobj2 */
-static int tps_cmp_cb(void *obj, void *arg, void *data, int flags)
+static int tps_cmp_cb(void *obj, void *arg, int flags)
 {
 	struct ast_taskprocessor *lhs = obj, *rhs = arg;
 
@@ -415,7 +415,7 @@ struct ast_taskprocessor *ast_taskprocessor_get(char *name, enum ast_tps_options
 		return NULL;
 	}
 	ao2_lock(tps_singletons);
-	p = ao2_find(tps_singletons, &tmp_tps, NULL, OBJ_POINTER);
+	p = ao2_find(tps_singletons, &tmp_tps, OBJ_POINTER);
 	if (p) {
 		ao2_unlock(tps_singletons);
 		return p;