[svn-commits] russell: branch russell/issue_13566 r166261 - in /team/russell/issue_13566: i...

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Dec 22 08:37:15 2008
New Revision: 166261

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166261
Log:
Remove ao2_cb_true, as it is not necessary

Modified:
    team/russell/issue_13566/include/asterisk/astobj2.h
    team/russell/issue_13566/main/astobj2.c
    team/russell/issue_13566/res/res_musiconhold.c

Modified: team/russell/issue_13566/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/team/russell/issue_13566/include/asterisk/astobj2.h?view=diff&rev=166261&r1=166260&r2=166261
==============================================================================
--- team/russell/issue_13566/include/asterisk/astobj2.h (original)
+++ team/russell/issue_13566/include/asterisk/astobj2.h Mon Dec 22 08:37:15 2008
@@ -557,9 +557,4 @@
 
 void *ao2_iterator_next(struct ao2_iterator *a);
 
-/*!
- * \brief Returns CMP_MATCH every time.
- */
-int ao2_cb_true(void *user_data, void *arg, int flags);
-
 #endif /* _ASTERISK_ASTOBJ2_H */

Modified: team/russell/issue_13566/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/russell/issue_13566/main/astobj2.c?view=diff&rev=166261&r1=166260&r2=166261
==============================================================================
--- team/russell/issue_13566/main/astobj2.c (original)
+++ team/russell/issue_13566/main/astobj2.c Mon Dec 22 08:37:15 2008
@@ -439,7 +439,7 @@
 /*! 
  * \brief special callback that matches all 
  */ 
-int ao2_cb_true(void *user_data, void *arg, int flags)
+static int cb_true(void *user_data, void *arg, int flags)
 {
 	return CMP_MATCH;
 }
@@ -475,7 +475,7 @@
 	else
 #endif
 	if (cb_fn == NULL)	/* if NULL, match everything */
-		cb_fn = ao2_cb_true;
+		cb_fn = cb_true;
 	/*
 	 * XXX this can be optimized.
 	 * If we have a hash function and lookup by pointer,

Modified: team/russell/issue_13566/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/russell/issue_13566/res/res_musiconhold.c?view=diff&rev=166261&r1=166260&r2=166261
==============================================================================
--- team/russell/issue_13566/res/res_musiconhold.c (original)
+++ team/russell/issue_13566/res/res_musiconhold.c Mon Dec 22 08:37:15 2008
@@ -1300,7 +1300,7 @@
 		ast_verbose(VERBOSE_PREFIX_2 "Destroying musiconhold processes\n");
 	}
 
-	ao2_callback(mohclasses, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, ao2_cb_true, NULL);
+	ao2_callback(mohclasses, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
 }
 
 static int moh_cli(int fd, int argc, char *argv[])