[asterisk-commits] kmoore: branch kmoore/stasis-bridging-channel_events r385828 - /team/kmoore/s...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Apr 16 07:56:01 2013
New Revision: 385828

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385828
Log:
variable naming tweak

Modified:
    team/kmoore/stasis-bridging-channel_events/res/res_stasis.c

Modified: team/kmoore/stasis-bridging-channel_events/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging-channel_events/res/res_stasis.c?view=diff&rev=385828&r1=385827&r2=385828
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/res/res_stasis.c (original)
+++ team/kmoore/stasis-bridging-channel_events/res/res_stasis.c Tue Apr 16 07:56:01 2013
@@ -78,7 +78,7 @@
 struct ao2_container *blob_handlers;
 
 /*! \brief Message router for the channel caching topic */
-struct stasis_message_router *app_channel_router;
+struct stasis_message_router *channel_router;
 
 /*! Ref-counting accessor for the stasis applications container */
 static struct ao2_container *apps_registry(void)
@@ -903,13 +903,13 @@
 	register_blob_handler("varset", handle_blob_generic);
 	register_blob_handler("dtmf_end", handle_blob_dtmf);
 
-	app_channel_router = stasis_message_router_create(stasis_caching_get_topic(ast_channel_topic_all_cached()));
-	if (!app_channel_router) {
+	channel_router = stasis_message_router_create(stasis_caching_get_topic(ast_channel_topic_all_cached()));
+	if (!channel_router) {
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
-	r |= stasis_message_router_add(app_channel_router, stasis_cache_update_type(), sub_snapshot_handler, NULL);
-	r |= stasis_message_router_add(app_channel_router, ast_channel_blob_type(), sub_blob_handler, NULL);
+	r |= stasis_message_router_add(channel_router, stasis_cache_update_type(), sub_snapshot_handler, NULL);
+	r |= stasis_message_router_add(channel_router, ast_channel_blob_type(), sub_blob_handler, NULL);
 	if (r) {
 		return AST_MODULE_LOAD_FAILURE;
 	}
@@ -921,8 +921,8 @@
 {
 	int r = 0;
 
-	stasis_message_router_unsubscribe(app_channel_router);
-	app_channel_router = NULL;
+	stasis_message_router_unsubscribe(channel_router);
+	channel_router = NULL;
 
 	ao2_cleanup(blob_handlers);
 	blob_handlers = NULL;