[asterisk-commits] mmichelson: trunk r81427 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Sat Sep  1 01:03:22 2007
New Revision: 81427

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81427
Log:
Merged revisions 81426 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81426 | mmichelson | 2007-09-01 01:02:06 -0500 (Sat, 01 Sep 2007) | 4 lines

Making match_by_addr into ao2_match_by_addr and making it available
everywhere since it could be a handy callback to have


........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/astobj2.h
    trunk/main/astobj2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/astobj2.h?view=diff&rev=81427&r1=81426&r2=81427
==============================================================================
--- trunk/include/asterisk/astobj2.h (original)
+++ trunk/include/asterisk/astobj2.h Sat Sep  1 01:03:22 2007
@@ -430,6 +430,7 @@
 	enum search_flags flags,
 	ao2_callback_fn cb_fn, void *arg);
 
+int ao2_match_by_addr(void *user_data, void *arg, int flags);
 /*!
  *
  *

Modified: trunk/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/trunk/main/astobj2.c?view=diff&rev=81427&r1=81426&r2=81427
==============================================================================
--- trunk/main/astobj2.c (original)
+++ trunk/main/astobj2.c Sat Sep  1 01:03:22 2007
@@ -349,7 +349,7 @@
 /*!
  * \brief another convenience function is a callback that matches on address
  */
-static int match_by_addr(void *user_data, void *arg, int flags)
+int ao2_match_by_addr(void *user_data, void *arg, int flags)
 {
 	return (user_data == arg) ? (CMP_MATCH | CMP_STOP) : 0;
 }
@@ -363,7 +363,7 @@
 	if (INTERNAL_OBJ(user_data) == NULL)	/* safety check on the argument */
 		return NULL;
 
-	ao2_callback(c, OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA, match_by_addr, user_data);
+	ao2_callback(c, OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA, ao2_match_by_addr, user_data);
 
 	return NULL;
 }