kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +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

4
main/manager.c
View File

@@ -3568,7 +3568,7 @@ static int variable_count_hash_fn(const void *vvc, const int flags)
return res;
}
static int variable_count_cmp_fn(void *obj, void *vstr, void *data, int flags)
static int variable_count_cmp_fn(void *obj, void *vstr, int flags)
{
/* Due to the simplicity of struct variable_count, it makes no difference
* if you pass in objects or strings, the same operation applies. This is
@@ -3677,7 +3677,7 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *v
if (!in_data) { /* build appropriate line start */
ast_str_append(out, 0, xml ? " " : "<tr><td>");
if ((vc = ao2_find(vco, var, NULL, 0)))
if ((vc = ao2_find(vco, var, 0)))
vc->count++;
else {
/* Create a new entry for this one */