[svn-commits] rmudgett: branch 12 r409967 - /branches/12/res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Mar  5 18:17:11 2014
New Revision: 409967

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409967
Log:
res_musiconhold.c: Remove some unnecessary RAII_VAR() usage.

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

Modified:
    branches/12/res/res_musiconhold.c

Modified: branches/12/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_musiconhold.c?view=diff&rev=409967&r1=409966&r2=409967
==============================================================================
--- branches/12/res/res_musiconhold.c (original)
+++ branches/12/res/res_musiconhold.c Wed Mar  5 18:17:11 2014
@@ -1276,7 +1276,7 @@
 /*!
  * \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)
 {
 	struct mohclass *mohclass = NULL;
@@ -1380,8 +1380,8 @@
 	struct mohclass *mohclass = NULL;
 	struct moh_files_state *state = ast_channel_music_state(chan);
 	struct ast_variable *var = NULL;
-	RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
-	RAII_VAR(struct ast_json *, json_object, NULL, ast_json_unref);
+	struct stasis_message *message;
+	struct ast_json *json_object;
 	int res;
 	int realtime_possible = ast_check_realtime("musiconhold");
 
@@ -1598,6 +1598,8 @@
 	if (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");
 
@@ -1606,7 +1608,8 @@
 
 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_deactivate_generator(chan);
 
@@ -1623,6 +1626,7 @@
 		stasis_publish(ast_channel_topic(chan), message);
 	}
 	ast_channel_unlock(chan);
+	ao2_cleanup(message);
 }
 
 static void moh_class_destructor(void *obj)