From 1bfe10997b8cd79015c49dba761ead9d623b1555 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Sat, 1 Sep 2007 06:03:22 +0000 Subject: [PATCH] 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81427 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/astobj2.h | 1 + main/astobj2.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index 0f51ceab1c..088bff0596 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -430,6 +430,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 4f338af44d..bd8480629e 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -349,7 +349,7 @@ void *ao2_link(ao2_container *c, void *user_data) /*! * \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 @@ 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; }