[svn-commits] mmichelson: branch mmichelson/bridged_channel r395718 - in /team/mmichelson/b...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Jul 29 17:13:37 2013
New Revision: 395718

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395718
Log:
Step 1: Get rid of the function.

This branch does not compile. Subsequent commits will correct uses
of ast_bridged_channel() one at a time. The order will be determined
by the order in which the compiler throws out errors.


Modified:
    team/mmichelson/bridged_channel/include/asterisk/channel.h
    team/mmichelson/bridged_channel/main/channel.c

Modified: team/mmichelson/bridged_channel/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/bridged_channel/include/asterisk/channel.h?view=diff&rev=395718&r1=395717&r2=395718
==============================================================================
--- team/mmichelson/bridged_channel/include/asterisk/channel.h (original)
+++ team/mmichelson/bridged_channel/include/asterisk/channel.h Mon Jul 29 17:13:37 2013
@@ -2328,26 +2328,6 @@
  * \param chan Channel to masquerade
  */
 void ast_do_masquerade(struct ast_channel *chan);
-
-/*!
- * \brief Find bridged channel
- *
- * \note This function does _not_ return a reference to the bridged channel.
- * The reason for this is mostly historical.  It _should_ return a reference,
- * but it will take a lot of work to make the code base account for that.
- * So, for now, the old rules still apply for how to handle this function.
- * If this function is being used from the channel thread that owns the channel,
- * then a reference is already held, and channel locking is not required to
- * guarantee that the channel will stay around.  If this function is used
- * outside of the associated channel thread, the channel parameter 'chan'
- * MUST be locked before calling this function.  Also, 'chan' must remain locked
- * for the entire time that the result of this function is being used.
- *
- * \param chan Current channel
- *
- * \return A pointer to the bridged channel
-*/
-struct ast_channel *ast_bridged_channel(struct ast_channel *chan);
 
 /*!
  * \brief Inherits channel variable from parent to child channel

Modified: team/mmichelson/bridged_channel/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/bridged_channel/main/channel.c?view=diff&rev=395718&r1=395717&r2=395718
==============================================================================
--- team/mmichelson/bridged_channel/main/channel.c (original)
+++ team/mmichelson/bridged_channel/main/channel.c Mon Jul 29 17:13:37 2013
@@ -6866,12 +6866,6 @@
 	ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, (ast_test_flag(ast_channel_flags(chan), AST_FLAG_DISABLE_DEVSTATE_CACHE) ? AST_DEVSTATE_NOT_CACHABLE : AST_DEVSTATE_CACHABLE), name);
 
 	return 0;
-}
-
-/*! BUGBUG ast_bridged_channel() is to be removed. */
-struct ast_channel *ast_bridged_channel(struct ast_channel *chan)
-{
-	return NULL;
 }
 
 /*! \brief Bridge two channels together (early) */