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

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Apr 17 13:53:20 2013
New Revision: 385981

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385981
Log:
pull in some changes that will need to be made anyway

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=385981&r1=385980&r2=385981
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/res/res_stasis.c (original)
+++ team/kmoore/stasis-bridging-channel_events/res/res_stasis.c Wed Apr 17 13:53:20 2013
@@ -75,7 +75,7 @@
 struct ao2_container *__app_controls;
 
 /*! \brief Container for handlers for channel blob messages */
-struct ao2_container *blob_handlers;
+struct ao2_container *channel_blob_handlers;
 
 /*! \brief Message router for the channel caching topic */
 struct stasis_message_router *channel_router;
@@ -575,12 +575,12 @@
 	ao2_callback(apps, OBJ_NODATA, app_send_cb, msg);
 }
 
-static struct ast_json *handle_blob(struct ast_channel_blob *obj)
+static struct ast_json *handle_channel_blob(struct ast_channel_blob *obj)
 {
 	RAII_VAR(struct blob_handler *, handler, NULL, ao2_cleanup);
 	const char *handler_type = ast_channel_blob_json_type(obj);
 
-	handler = ao2_find(blob_handlers, handler_type, OBJ_KEY);
+	handler = ao2_find(channel_blob_handlers, handler_type, OBJ_KEY);
 	if (!handler) {
 		return NULL;
 	}
@@ -606,7 +606,7 @@
 		return;
 	}
 
-	msg = handle_blob(obj);
+	msg = handle_channel_blob(obj);
 	if (!msg) {
 		return;
 	}
@@ -816,7 +816,7 @@
 		return;
 	}
 
-	ao2_link(blob_handlers, handler);
+	ao2_link(channel_blob_handlers, handler);
 }
 
 static int blob_handler_hash(const void *obj, const int flags)
@@ -848,8 +848,8 @@
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
-	blob_handlers = ao2_container_alloc(BLOB_HANDLER_BUCKETS, blob_handler_hash, blob_handler_cmp);
-	if (!blob_handlers) {
+	channel_blob_handlers = ao2_container_alloc(BLOB_HANDLER_BUCKETS, blob_handler_hash, blob_handler_cmp);
+	if (!channel_blob_handlers) {
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
@@ -879,8 +879,8 @@
 	stasis_message_router_unsubscribe(channel_router);
 	channel_router = NULL;
 
-	ao2_cleanup(blob_handlers);
-	blob_handlers = NULL;
+	ao2_cleanup(channel_blob_handlers);
+	channel_blob_handlers = NULL;
 
 	ao2_cleanup(__apps_registry);
 	__apps_registry = NULL;