[svn-commits] rmudgett: trunk r381086 - in /trunk: channels/ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Feb  8 19:31:55 2013
New Revision: 381086

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381086
Log:
Make ast_do_masquerade() a void function.

Modified:
    trunk/channels/chan_sip.c
    trunk/include/asterisk/channel.h
    trunk/main/channel.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=381086&r1=381085&r2=381086
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Feb  8 19:31:55 2013
@@ -24807,9 +24807,7 @@
 	ast_channel_unlock(c);
 	sip_pvt_unlock(p->refer->refer_call);
 	sip_pvt_unlock(p);
-	if (ast_do_masquerade(replacecall)) {
-		ast_log(LOG_WARNING, "Failed to perform masquerade with INVITE replaces\n");
-	}
+	ast_do_masquerade(replacecall);
 	ast_channel_lock(c);
 	if (earlyreplace || oneleggedreplace ) {
 		ast_channel_hangupcause_set(c, AST_CAUSE_SWITCH_CONGESTION);

Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=381086&r1=381085&r2=381086
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Fri Feb  8 19:31:55 2013
@@ -2322,7 +2322,7 @@
  *     while the features are nice, the cost is very high in terms of pure nastiness. XXX
  * \param chan Channel to masquerade
  */
-int ast_do_masquerade(struct ast_channel *chan);
+void ast_do_masquerade(struct ast_channel *chan);
 
 /*!
  * \brief Find bridged channel

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=381086&r1=381085&r2=381086
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Feb  8 19:31:55 2013
@@ -6863,7 +6863,7 @@
  *       this function, it invalidates our channel container locking order.  All channels
  *       must be unlocked before it is permissible to lock the channels' ao2 container.
  */
-int ast_do_masquerade(struct ast_channel *original)
+void ast_do_masquerade(struct ast_channel *original)
 {
 	int x;
 	int origstate;
@@ -6940,7 +6940,7 @@
 		 */
 		ast_channel_unlock(original);
 		ao2_unlock(channels);
-		return 0;
+		return;
 	}
 
 	/* Bump the refs to ensure that they won't dissapear on us. */
@@ -7345,8 +7345,6 @@
 	/* Release our held safety references. */
 	ast_channel_unref(original);
 	ast_channel_unref(clonechan);
-
-	return 0;
 }
 
 void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani)