kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass NULL for the ao2_callback function pointer instead of duplicating cb_true.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@239114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2010-01-11 16:41:44 +00:00
parent ba6201cae6
commit ea47ab7ed9
4 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_calendar_caldav.c
View File

@@ -68,11 +68,6 @@ struct caldav_pvt {
struct ao2_container *events; struct ao2_container *events;
}; };
static int cb_true(void *user_data, void *arg, int flags)
{
return CMP_MATCH;
}
static void caldav_destructor(void *obj) static void caldav_destructor(void *obj)
{ {
struct caldav_pvt *pvt = obj; struct caldav_pvt *pvt = obj;
@@ -83,7 +78,7 @@ static void caldav_destructor(void *obj)
} }
ast_string_field_free_memory(pvt); ast_string_field_free_memory(pvt);
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, cb_true, NULL); ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
ao2_ref(pvt->events, -1); ao2_ref(pvt->events, -1);
} }

7
res/res_calendar_exchange.c
View File

@@ -212,11 +212,6 @@ static int parse_cdata(void *data, char *value, size_t len)
return IKS_OK; return IKS_OK;
} }
static int cb_true(void *user_data, void *arg, int flags)
{
return CMP_MATCH;
}
static void exchangecal_destructor(void *obj) static void exchangecal_destructor(void *obj)
{ {
struct exchangecal_pvt *pvt = obj; struct exchangecal_pvt *pvt = obj;
@@ -227,7 +222,7 @@ static void exchangecal_destructor(void *obj)
} }
ast_string_field_free_memory(pvt); ast_string_field_free_memory(pvt);
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, cb_true, NULL); ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
ao2_ref(pvt->events, -1); ao2_ref(pvt->events, -1);
} }

7
res/res_calendar_icalendar.c
View File

@@ -64,11 +64,6 @@ struct icalendar_pvt {
struct ao2_container *events; struct ao2_container *events;
}; };
static int cb_true(void *user_data, void *arg, int flags)
{
return CMP_MATCH;
}
static void icalendar_destructor(void *obj) static void icalendar_destructor(void *obj)
{ {
struct icalendar_pvt *pvt = obj; struct icalendar_pvt *pvt = obj;
@@ -82,7 +77,7 @@ static void icalendar_destructor(void *obj)
} }
ast_string_field_free_memory(pvt); ast_string_field_free_memory(pvt);
ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, cb_true, NULL); ao2_callback(pvt->events, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
ao2_ref(pvt->events, -1); ao2_ref(pvt->events, -1);
} }

8
res/res_clialiases.c
View File

@@ -168,12 +168,6 @@ static struct ast_cli_entry cli_alias[] = {
AST_CLI_DEFINE(alias_show, "Show CLI command aliases"), AST_CLI_DEFINE(alias_show, "Show CLI command aliases"),
}; };
/*! \brief Function called to to see if an alias is marked for destruction, they always are! */
static int alias_marked(void *obj, void *arg, int flags)
{
return CMP_MATCH;
}
/*! \brief Function called to load or reload the configuration file */ /*! \brief Function called to load or reload the configuration file */
static void load_config(int reload) static void load_config(int reload)
{ {
@@ -191,7 +185,7 @@ static void load_config(int reload)
/* Destroy any existing CLI aliases */ /* Destroy any existing CLI aliases */
if (reload) { if (reload) {
ao2_callback(cli_aliases, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE , alias_marked, NULL); ao2_callback(cli_aliases, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, NULL, NULL);
} }
for (v = ast_variable_browse(cfg, "general"); v; v = v->next) { for (v = ast_variable_browse(cfg, "general"); v; v = v->next) {