[svn-commits] mmichelson: branch mmichelson/transfer_stasis r392461 - in /team/mmichelson/t...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jun 21 13:29:01 2013
New Revision: 392461

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392461
Log:
Fix small-scale review feedback from kmoore.

* Don't lie that transfer results will always be a failure.
* Get rid of whitespace inconsistencies.


Modified:
    team/mmichelson/transfer_stasis/include/asterisk/stasis_bridging.h
    team/mmichelson/transfer_stasis/main/manager_bridging.c

Modified: team/mmichelson/transfer_stasis/include/asterisk/stasis_bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/transfer_stasis/include/asterisk/stasis_bridging.h?view=diff&rev=392461&r1=392460&r2=392461
==============================================================================
--- team/mmichelson/transfer_stasis/include/asterisk/stasis_bridging.h (original)
+++ team/mmichelson/transfer_stasis/include/asterisk/stasis_bridging.h Fri Jun 21 13:29:01 2013
@@ -280,7 +280,7 @@
  * \brief Message representing attended transfer
  */
 struct ast_attended_transfer_message {
-	/*! Result of the blind transfer */
+	/*! Result of the attended transfer */
 	enum ast_transfer_result result;
 	/*! Indicates if the transfer was initiated externally*/
 	int is_external;
@@ -337,7 +337,7 @@
  * In either case, two bridges enter, one leaves.
  *
  * \param is_external Indicates if the transfer was initiated externally
- * \param result The result of the transfer. Will always be a type of failure.
+ * \param result The result of the transfer.
  * \param transferee The bridge between the transferer and transferees as well as the transferer channel from that bridge
  * \param target The bridge between the transferer and transfer targets as well as the transferer channel from that bridge
  * \param final_bridge The bridge that the parties end up in. Will be a bridge from the transferee or target pair.
@@ -348,7 +348,7 @@
 
 /*!
  * \since 12
- * \brief Publish an attended transfer failure
+ * \brief Publish an attended transfer that results in an application being run
  *
  * Publish an \ref ast_attended_transfer_message with the dest_type set to
  * \c AST_ATTENDED_TRANSFER_DEST_APP. This occurs when an attended transfer
@@ -358,7 +358,7 @@
  * \li A bridge of transferees running an app (via a local channel)
  *
  * \param is_external Indicates if the transfer was initiated externally
- * \param result The result of the transfer. Will always be a type of failure.
+ * \param result The result of the transfer.
  * \param transferee The bridge between the transferer and transferees as well as the transferer channel from that bridge
  * \param target The bridge between the transferer and transfer targets as well as the transferer channel from that bridge
  * \param dest_app The application that the channel or bridge is running upon transfer completion.
@@ -369,7 +369,7 @@
 
 /*!
  * \since 12
- * \brief Publish an attended transfer failure
+ * \brief Publish an attended transfer that results in two bridges linked by a local channel
  *
  * Publish an \ref ast_attended_transfer_message with the dest_type set to
  * \c AST_ATTENDED_TRANSFER_DEST_LINK. This occurs when two bridges are involved
@@ -381,7 +381,7 @@
  * transfer and a local channel is used to link the two bridges together.
  *
  * \param is_external Indicates if the transfer was initiated externally
- * \param result The result of the transfer. Will always be a type of failure.
+ * \param result The result of the transfer.
  * \param transferee The bridge between the transferer and transferees as well as the transferer channel from that bridge
  * \param target The bridge between the transferer and transfer targets as well as the transferer channel from that bridge
  * \param locals The local channels linking the bridges together.

Modified: team/mmichelson/transfer_stasis/main/manager_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/transfer_stasis/main/manager_bridging.c?view=diff&rev=392461&r1=392460&r2=392461
==============================================================================
--- team/mmichelson/transfer_stasis/main/manager_bridging.c (original)
+++ team/mmichelson/transfer_stasis/main/manager_bridging.c Fri Jun 21 13:29:01 2013
@@ -445,7 +445,7 @@
 	manager_topic = ast_manager_get_topic();
 	if (!manager_topic) {
 		return -1;
- 	}
+	}
 
 	bridge_topic = stasis_caching_get_topic(ast_bridge_topic_all_cached());
 	if (!bridge_topic) {
@@ -454,8 +454,8 @@
 
 	topic_forwarder = stasis_forward_all(bridge_topic, manager_topic);
 	if (!topic_forwarder) {
- 		return -1;
- 	}
+		return -1;
+	}
 
 	/* BUGBUG - This should really route off of the manager_router, but
 	 * can't b/c manager_channels is already routing the