[asterisk-commits] rmudgett: branch group/bridge_construction r388936 - in /team/group/bridge_co...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 16 18:29:29 2013
New Revision: 388936

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388936
Log:
* Make ast_unreal_new_channels() take a const requestor to eliminate some casts.

* Tweaked ast_bridge_impart() doxygen description.

Modified:
    team/group/bridge_construction/include/asterisk/bridging.h
    team/group/bridge_construction/include/asterisk/core_unreal.h
    team/group/bridge_construction/main/core_local.c
    team/group/bridge_construction/main/core_unreal.c

Modified: team/group/bridge_construction/include/asterisk/bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/include/asterisk/bridging.h?view=diff&rev=388936&r1=388935&r2=388936
==============================================================================
--- team/group/bridge_construction/include/asterisk/bridging.h (original)
+++ team/group/bridge_construction/include/asterisk/bridging.h Thu May 16 18:29:29 2013
@@ -679,9 +679,10 @@
  * parameter.
  *
  * \note If you impart a channel as not independent you MUST
- * ast_bridge_depart() the channel.  The bridge channel thread
- * is created join-able.  The implication is that the channel is
- * special and will not behave like a normal channel.
+ * ast_bridge_depart() the channel if this call succeeds.  The
+ * bridge channel thread is created join-able.  The implication
+ * is that the channel is special and will not behave like a
+ * normal channel.
  *
  * \note If you impart a channel as independent you must not
  * ast_bridge_depart() the channel.  The bridge channel thread

Modified: team/group/bridge_construction/include/asterisk/core_unreal.h
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/include/asterisk/core_unreal.h?view=diff&rev=388936&r1=388935&r2=388936
==============================================================================
--- team/group/bridge_construction/include/asterisk/core_unreal.h (original)
+++ team/group/bridge_construction/include/asterisk/core_unreal.h Thu May 16 18:29:29 2013
@@ -166,7 +166,7 @@
  */
 struct ast_channel *ast_unreal_new_channels(struct ast_unreal_pvt *p,
 	const struct ast_channel_tech *tech, int semi1_state, int semi2_state,
-	const char *exten, const char *context, struct ast_channel *requestor,
+	const char *exten, const char *context, const struct ast_channel *requestor,
 	struct ast_callid *callid);
 
 /*!

Modified: team/group/bridge_construction/main/core_local.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/main/core_local.c?view=diff&rev=388936&r1=388935&r2=388936
==============================================================================
--- team/group/bridge_construction/main/core_local.c (original)
+++ team/group/bridge_construction/main/core_local.c Thu May 16 18:29:29 2013
@@ -618,7 +618,7 @@
 	}
 	callid = ast_read_threadstorage_callid();
 	chan = ast_unreal_new_channels(&p->base, &local_tech, AST_STATE_DOWN, AST_STATE_RING,
-		p->exten, p->context, (struct ast_channel *) requestor, callid);
+		p->exten, p->context, requestor, callid);
 	if (chan) {
 		ao2_link(locals, p);
 	}

Modified: team/group/bridge_construction/main/core_unreal.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/main/core_unreal.c?view=diff&rev=388936&r1=388935&r2=388936
==============================================================================
--- team/group/bridge_construction/main/core_unreal.c (original)
+++ team/group/bridge_construction/main/core_unreal.c Thu May 16 18:29:29 2013
@@ -781,7 +781,7 @@
 
 struct ast_channel *ast_unreal_new_channels(struct ast_unreal_pvt *p,
 	const struct ast_channel_tech *tech, int semi1_state, int semi2_state,
-	const char *exten, const char *context, struct ast_channel *requestor,
+	const char *exten, const char *context, const struct ast_channel *requestor,
 	struct ast_callid *callid)
 {
 	struct ast_channel *owner;
@@ -839,7 +839,8 @@
 
 	ast_jb_configure(owner, &p->jb_conf);
 
-	if (ast_channel_cc_params_init(owner, requestor ? ast_channel_get_cc_config_params(requestor) : NULL)) {
+	if (ast_channel_cc_params_init(owner, requestor
+		? ast_channel_get_cc_config_params((struct ast_channel *) requestor) : NULL)) {
 		ast_channel_release(owner);
 		ast_channel_release(chan);
 		return NULL;