[asterisk-commits] mmichelson: branch mmichelson/atxfer_features r393481 - in /team/mmichelson/a...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jul  2 14:35:31 2013
New Revision: 393481

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393481
Log:
Make private a couple of functions that have no business being public.


Modified:
    team/mmichelson/atxfer_features/include/asterisk/bridging_basic.h
    team/mmichelson/atxfer_features/main/bridging_basic.c

Modified: team/mmichelson/atxfer_features/include/asterisk/bridging_basic.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/atxfer_features/include/asterisk/bridging_basic.h?view=diff&rev=393481&r1=393480&r2=393481
==============================================================================
--- team/mmichelson/atxfer_features/include/asterisk/bridging_basic.h (original)
+++ team/mmichelson/atxfer_features/include/asterisk/bridging_basic.h Tue Jul  2 14:35:31 2013
@@ -98,16 +98,6 @@
 /*! Initialize the basic bridge class for use by the system. */
 void ast_bridging_init_basic(void);
 
-/* XXX Everything below this point can likely be made private to bridging_basic.c
- * If not, then attended_transfer_properties needs an ast_ prefix and the
- * functions need doxygen
- */
-struct attended_transfer_properties;
-
-void ast_bridge_basic_change_personality_atxfer(struct ast_bridge *bridge,
-		struct attended_transfer_properties *props);
-void ast_bridge_basic_change_personality_normal(struct ast_bridge *bridge);
-
 /* ------------------------------------------------------------------- */
 
 #if defined(__cplusplus) || defined(c_plusplus)

Modified: team/mmichelson/atxfer_features/main/bridging_basic.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/atxfer_features/main/bridging_basic.c?view=diff&rev=393481&r1=393480&r2=393481
==============================================================================
--- team/mmichelson/atxfer_features/main/bridging_basic.c (original)
+++ team/mmichelson/atxfer_features/main/bridging_basic.c Tue Jul  2 14:35:31 2013
@@ -50,6 +50,12 @@
 
 #define TRANSFER_FLAGS AST_BRIDGE_FLAG_SMART
 #define TRANSFERER_ROLE_NAME "transferer" 
+
+struct attended_transfer_properties;
+
+static void bridge_basic_change_personality_atxfer(struct ast_bridge *bridge,
+		struct attended_transfer_properties *props);
+static void bridge_basic_change_personality_normal(struct ast_bridge *bridge);
 
 /* ------------------------------------------------------------------- */
 
@@ -1070,7 +1076,7 @@
 {
 	if (props->transferee_bridge) {
 		ast_bridge_merge_inhibit(props->transferee_bridge, -1);
-		ast_bridge_basic_change_personality_normal(props->transferee_bridge);
+		bridge_basic_change_personality_normal(props->transferee_bridge);
 	}
 
 	if (props->transfer_target) {
@@ -1609,7 +1615,7 @@
 		 * will change the personality of the transfer target bridge back to normal, and play
 		 * a sound to the transferer to indicate the transferee is gone.
 		 */
-		ast_bridge_basic_change_personality_normal(props->target_bridge);
+		bridge_basic_change_personality_normal(props->target_bridge);
 		play_sound(props->transferer, props->failsound);
 		/* These next two lines are here to ensure that our reference to the target bridge
 		 * is cleaned up properly and that the target bridge is not destroyed when the
@@ -2443,8 +2449,8 @@
 		return 0;
 	}
 
-	ast_bridge_basic_change_personality_atxfer(props->target_bridge, props);
-	ast_bridge_basic_change_personality_atxfer(bridge, props);
+	bridge_basic_change_personality_atxfer(props->target_bridge, props);
+	bridge_basic_change_personality_atxfer(bridge, props);
 
 	if (ast_call(props->transfer_target, destination, 0)) {
 		ast_log(LOG_ERROR, "Unable to place outbound call to transfer target\n");
@@ -2547,7 +2553,7 @@
  * the previous personality the bridge had and add back any hooks or features
  * that should be present on the bridge channels.
  */
-void ast_bridge_basic_change_personality_normal(struct ast_bridge *bridge)
+static void bridge_basic_change_personality_normal(struct ast_bridge *bridge)
 {
 	struct ast_bridge_channel *bridge_channel;
 	struct bridge_basic_personality *personality;
@@ -2575,7 +2581,7 @@
  * are needed so that v_table methods for the atxfer personality can access
  * the data they need.
  */
-void ast_bridge_basic_change_personality_atxfer(struct ast_bridge *bridge,
+static void bridge_basic_change_personality_atxfer(struct ast_bridge *bridge,
 		struct attended_transfer_properties *props)
 {
 	struct bridge_basic_personality *personality;