Making match_by_addr into ao2_match_by_addr and making it available

everywhere since it could be a handy callback to have

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81426 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index bc2476de4c99eff5f73f093b43355d6d340a1594..d4b3f2b6381635323ca7ec9e1c8876db5cc49bb2 100644 (file)
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -437,6 +437,7 @@ void *ao2_callback(ao2_container *c,
        enum search_flags flags,
        ao2_callback_fn cb_fn, void *arg);
 
+int ao2_match_by_addr(void *user_data, void *arg, int flags);
 /*!
  *
  *

diff --git a/main/astobj2.c b/main/astobj2.c
index 8c3e19446fdbf110310cda4965b809acb4c0a5b5..ecf8e38e6a568f66cbcea55a5b5f3835d121b88c 100644 (file)
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -352,7 +352,7 @@ void *__ao2_link(ao2_container *c, void *user_data, int iax2_hack)
 /*!
  * \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;
 }
@@ -366,7 +366,7 @@ void *ao2_unlink(ao2_container *c, void *user_data)
        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;
 }