[asterisk-commits] murf: branch murf/bug11210 r106321 - /team/murf/bug11210/main/astobj2.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Mar  5 18:48:18 2008
New Revision: 106321

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106321
Log:
Clean up container destruct calls. This is easy stuff to get mixed up.

Modified:
    team/murf/bug11210/main/astobj2.c

Modified: team/murf/bug11210/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/main/astobj2.c?view=diff&rev=106321&r1=106320&r2=106321
==============================================================================
--- team/murf/bug11210/main/astobj2.c (original)
+++ team/murf/bug11210/main/astobj2.c Wed Mar  5 18:48:18 2008
@@ -638,9 +638,8 @@
 	return __ao2_callback(c,flags, cb_fn, arg, tag, file, line, funcname);
 }
 
-void *_ao2_callback(struct ao2_container *c,
-	const enum search_flags flags,
-	ao2_callback_fn *cb_fn, void *arg)
+void *_ao2_callback(struct ao2_container *c,const enum search_flags flags,
+                    ao2_callback_fn *cb_fn, void *arg)
 {
 	return __ao2_callback(c,flags, cb_fn, arg, NULL, NULL, 0, NULL);
 }
@@ -784,7 +783,7 @@
 {
 	struct ao2_container *c = _c;
 
-	ao2_t_callback(c, OBJ_UNLINK, cd_cb, NULL, "container_destruct called");
+	_ao2_callback(c, OBJ_UNLINK, cd_cb, NULL);
 
 #ifdef AO2_DEBUG
 	ast_atomic_fetchadd_int(&ao2.total_containers, -1);
@@ -795,7 +794,7 @@
 {
 	struct ao2_container *c = _c;
 
-	ao2_t_callback(c, OBJ_UNLINK, cd_cb_debug, NULL, "container_destruct_debug called");
+	_ao2_callback_debug(c, OBJ_UNLINK, cd_cb_debug, NULL, "container_destruct_debug called", __FILE__, __LINE__, __PRETTY_FUNCTION__);
 
 #ifdef AO2_DEBUG
 	ast_atomic_fetchadd_int(&ao2.total_containers, -1);