kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

This is basically a complete rollback of r155401, as it was determined that

Browse Source 
it would be best to maintain API compatibility.  Instead, this commit introduces
ao2_callback_data() which is functionally identical to ao2_callback() except
that it allows you to pass arbitrary data to the callback.

Reviewed by Mark Michelson via ReviewBoard:
	http://reviewboard.digium.com/r/64


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-11-25 01:01:49 +00:00
parent 69d85eaca9
commit fd8caa1778
16 changed files with 236 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_phoneprov.c
View File

@@ -237,7 +237,7 @@ static struct phone_profile *find_profile(const char *name)
.name = name,
};
return ao2_find(profiles, &tmp, NULL, OBJ_POINTER);
return ao2_find(profiles, &tmp, OBJ_POINTER);
}
static int profile_hash_fn(const void *obj, const int flags)
@@ -247,7 +247,7 @@ static int profile_hash_fn(const void *obj, const int flags)
return ast_str_case_hash(profile->name);
}
static int profile_cmp_fn(void *obj, void *arg, void *data, int flags)
static int profile_cmp_fn(void *obj, void *arg, int flags)
{
const struct phone_profile *profile1 = obj, *profile2 = arg;
@@ -293,7 +293,7 @@ static int routes_hash_fn(const void *obj, const int flags)
return ast_str_case_hash(route->uri);
}
static int routes_cmp_fn(void *obj, void *arg, void *data, int flags)
static int routes_cmp_fn(void *obj, void *arg, int flags)
{
const struct http_route *route1 = obj, *route2 = arg;
@@ -413,7 +413,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, NULL, OBJ_POINTER))) {
if (!(route = ao2_find(http_routes, &search_route, OBJ_POINTER))) {
goto out404;
}
@@ -778,7 +778,7 @@ static struct user *find_user(const char *macaddress)
.macaddress = macaddress,
};
return ao2_find(users, &tmp, NULL, OBJ_POINTER);
return ao2_find(users, &tmp, OBJ_POINTER);
}
static int users_hash_fn(const void *obj, const int flags)
@@ -788,7 +788,7 @@ static int users_hash_fn(const void *obj, const int flags)
return ast_str_case_hash(user->macaddress);
}
static int users_cmp_fn(void *obj, void *arg, void *data, int flags)
static int users_cmp_fn(void *obj, void *arg, int flags)
{
const struct user *user1 = obj, *user2 = arg;