[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r383400 - in /team/rmudgett/bridge_pha...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Mar 19 18:03:56 2013
New Revision: 383400

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383400
Log:
Move and rename ast_bridging_init() declaration.

Modified:
    team/rmudgett/bridge_phase/include/asterisk/_private.h
    team/rmudgett/bridge_phase/include/asterisk/bridging.h
    team/rmudgett/bridge_phase/main/asterisk.c
    team/rmudgett/bridge_phase/main/bridging.c

Modified: team/rmudgett/bridge_phase/include/asterisk/_private.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/include/asterisk/_private.h?view=diff&rev=383400&r1=383399&r2=383400
==============================================================================
--- team/rmudgett/bridge_phase/include/asterisk/_private.h (original)
+++ team/rmudgett/bridge_phase/include/asterisk/_private.h Tue Mar 19 18:03:56 2013
@@ -50,6 +50,15 @@
 int ast_msg_init(void);             /*!< Provided by message.c */
 void ast_msg_shutdown(void);        /*!< Provided by message.c */
 int aco_init(void);             /*!< Provided by config_options.c */
+
+/*!
+ * \brief Initialize the bridging system.
+ * \since 12.0.0
+ *
+ * \retval 0 on success.
+ * \retval -1 on error.
+ */
+int ast_bridging_init(void);
 
 /*!
  * \brief Reload asterisk modules.

Modified: team/rmudgett/bridge_phase/include/asterisk/bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/include/asterisk/bridging.h?view=diff&rev=383400&r1=383399&r2=383400
==============================================================================
--- team/rmudgett/bridge_phase/include/asterisk/bridging.h (original)
+++ team/rmudgett/bridge_phase/include/asterisk/bridging.h Tue Mar 19 18:03:56 2013
@@ -256,15 +256,6 @@
 };
 
 /*!
- * \brief Initialize the bridging system.
- * \since 12.0.0
- *
- * \retval 0 on success.
- * \retval -1 on error.
- */
-int ast_bridge_init(void);
-
-/*!
  * \brief Create a new bridge
  *
  * \param capabilities The capabilities that we require to be used on the bridge

Modified: team/rmudgett/bridge_phase/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/asterisk.c?view=diff&rev=383400&r1=383399&r2=383400
==============================================================================
--- team/rmudgett/bridge_phase/main/asterisk.c (original)
+++ team/rmudgett/bridge_phase/main/asterisk.c Tue Mar 19 18:03:56 2013
@@ -4272,7 +4272,7 @@
 		exit(1);
 	}
 
-	if (ast_bridge_init()) {
+	if (ast_bridging_init()) {
 		printf("%s", term_quit());
 		exit(1);
 	}

Modified: team/rmudgett/bridge_phase/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/bridging.c?view=diff&rev=383400&r1=383399&r2=383400
==============================================================================
--- team/rmudgett/bridge_phase/main/bridging.c (original)
+++ team/rmudgett/bridge_phase/main/bridging.c Tue Mar 19 18:03:56 2013
@@ -47,6 +47,7 @@
 #include "asterisk/astobj2.h"
 #include "asterisk/pbx.h"
 #include "asterisk/test.h"
+#include "asterisk/_private.h"
 
 #include "asterisk/heap.h"
 #include "asterisk/say.h"
@@ -3186,7 +3187,7 @@
 	bridge_manager = NULL;
 }
 
-int ast_bridge_init(void)
+int ast_bridging_init(void)
 {
 	bridge_manager = bridge_manager_create();
 	if (!bridge_manager) {