diff options
author | Sean Bright <sean@malleable.com> | 2008-11-07 22:39:30 +0000 |
---|---|---|
committer | Sean Bright <sean@malleable.com> | 2008-11-07 22:39:30 +0000 |
commit | 30d1744ffce823312d51379585e8c19f722ea4d6 (patch) | |
tree | 80eea1f19a98b0f9ca3ab09f32d0eea8aa0f85d5 /res/res_phoneprov.c | |
parent | bd3f685f205c602554b84f458e6bc67a37d4d3c0 (diff) |
Add ability to pass arbitrary data to the ao2_callback_fn (called from
ao2_callback and ao2_find). Currently, passing OBJ_POINTER to either
of these mandates that the passed 'arg' is a hashable object, making
searching for an ao2 object based on outside criteria difficult.
Reviewed by Russell and Mark M. via ReviewBoard:
http://reviewboard.digium.com/r/36/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@155401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_phoneprov.c')
-rw-r--r-- | res/res_phoneprov.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index cd63a265a..5fcb29466 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -236,7 +236,7 @@ static struct phone_profile *find_profile(const char *name) .name = name, }; - return ao2_find(profiles, &tmp, OBJ_POINTER); + return ao2_find(profiles, &tmp, NULL, OBJ_POINTER); } static int profile_hash_fn(const void *obj, const int flags) @@ -246,7 +246,7 @@ static int profile_hash_fn(const void *obj, const int flags) return ast_str_hash(profile->name); } -static int profile_cmp_fn(void *obj, void *arg, int flags) +static int profile_cmp_fn(void *obj, void *arg, void *data, int flags) { const struct phone_profile *profile1 = obj, *profile2 = arg; @@ -299,7 +299,7 @@ static int routes_hash_fn(const void *obj, const int flags) return ast_str_hash(uri); } -static int routes_cmp_fn(void *obj, void *arg, int flags) +static int routes_cmp_fn(void *obj, void *arg, void *data, int flags) { const struct http_route *route1 = obj, *route2 = arg; @@ -419,7 +419,7 @@ static struct ast_str *phoneprov_callback(struct ast_tcptls_session_instance *se struct timeval now = ast_tvnow(); struct ast_tm tm; - if (!(route = ao2_find(http_routes, &search_route, OBJ_POINTER))) { + if (!(route = ao2_find(http_routes, &search_route, NULL, OBJ_POINTER))) { goto out404; } @@ -780,7 +780,7 @@ static struct user *find_user(const char *macaddress) .macaddress = macaddress, }; - return ao2_find(users, &tmp, OBJ_POINTER); + return ao2_find(users, &tmp, NULL, OBJ_POINTER); } static int users_hash_fn(const void *obj, const int flags) @@ -797,7 +797,7 @@ static int users_hash_fn(const void *obj, const int flags) return ast_str_hash(mac); } -static int users_cmp_fn(void *obj, void *arg, int flags) +static int users_cmp_fn(void *obj, void *arg, void *data, int flags) { const struct user *user1 = obj, *user2 = arg; |