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

res_musiconhold.c: Remove some unnecessary RAII_VAR() usage.

Browse Source 
* Made the moh_register() define use useful parameter names.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@409967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-03-06 00:17:11 +00:00
parent 774847cbde
commit 93f81ee4ef
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_musiconhold.c
View File

@@ -1276,7 +1276,7 @@ static int init_app_class(struct mohclass *class)
/*! /*!
* \note This function owns the reference it gets to moh if unref is true * \note This function owns the reference it gets to moh if unref is true
*/ */
#define moh_register(a,b,c) _moh_register(a,b,c,__FILE__,__LINE__,__PRETTY_FUNCTION__) #define moh_register(moh, reload, unref) _moh_register(moh, reload, unref, __FILE__, __LINE__, __PRETTY_FUNCTION__)
static int _moh_register(struct mohclass *moh, int reload, int unref, const char *file, int line, const char *funcname) static int _moh_register(struct mohclass *moh, int reload, int unref, const char *file, int line, const char *funcname)
{ {
struct mohclass *mohclass = NULL; struct mohclass *mohclass = NULL;
@@ -1380,8 +1380,8 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
struct mohclass *mohclass = NULL; struct mohclass *mohclass = NULL;
struct moh_files_state *state = ast_channel_music_state(chan); struct moh_files_state *state = ast_channel_music_state(chan);
struct ast_variable *var = NULL; struct ast_variable *var = NULL;
RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup); struct stasis_message *message;
RAII_VAR(struct ast_json *, json_object, NULL, ast_json_unref); struct ast_json *json_object;
int res; int res;
int realtime_possible = ast_check_realtime("musiconhold"); int realtime_possible = ast_check_realtime("musiconhold");
@@ -1598,6 +1598,8 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
if (message) { if (message) {
stasis_publish(ast_channel_topic(chan), message); stasis_publish(ast_channel_topic(chan), message);
} }
ao2_cleanup(message);
ast_json_unref(json_object);
mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start"); mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start");
@@ -1606,7 +1608,8 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
static void local_ast_moh_stop(struct ast_channel *chan) static void local_ast_moh_stop(struct ast_channel *chan)
{ {
RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup); struct stasis_message *message;
ast_clear_flag(ast_channel_flags(chan), AST_FLAG_MOH); ast_clear_flag(ast_channel_flags(chan), AST_FLAG_MOH);
ast_deactivate_generator(chan); ast_deactivate_generator(chan);
@@ -1623,6 +1626,7 @@ static void local_ast_moh_stop(struct ast_channel *chan)
stasis_publish(ast_channel_topic(chan), message); stasis_publish(ast_channel_topic(chan), message);
} }
ast_channel_unlock(chan); ast_channel_unlock(chan);
ao2_cleanup(message);
} }
static void moh_class_destructor(void *obj) static void moh_class_destructor(void *obj)