[asterisk-commits] gtjoseph: trunk r429543 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: gtjoseph
Date: Fri Dec 12 17:57:50 2014
New Revision: 429543

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429543
Log:
loader: Move definition of ast_module_reload from _private.h to module.h

No functionality change.  Just move the definition of ast_module_reload
from _private.h to module.h so it can be public.

Also removed the include of _private.h from manager.c since ast_module_load
was the only reason for including it.

Tested-by: George Joseph

Review: https://reviewboard.asterisk.org/r/4251/
........

Merged revisions 429542 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/_private.h
    trunk/include/asterisk/module.h
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/include/asterisk/_private.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/_private.h?view=diff&rev=429543&r1=429542&r2=429543
==============================================================================
--- trunk/include/asterisk/_private.h (original)
+++ trunk/include/asterisk/_private.h Fri Dec 12 17:57:50 2014
@@ -51,20 +51,6 @@
 int aco_init(void);             /*!< Provided by config_options.c */
 
 /*!
- * \since 12
- * \brief Possible return types for \ref ast_module_reload
- */
-enum ast_module_reload_result {
-	AST_MODULE_RELOAD_SUCCESS = 0,      /*!< The module was reloaded succesfully */
-	AST_MODULE_RELOAD_QUEUED,           /*!< The module reload request was queued */
-	AST_MODULE_RELOAD_NOT_FOUND,        /*!< The requested module was not found */
-	AST_MODULE_RELOAD_ERROR,            /*!< An error occurred while reloading the module */
-	AST_MODULE_RELOAD_IN_PROGRESS,      /*!< A module reload request is already in progress */
-	AST_MODULE_RELOAD_UNINITIALIZED,    /*!< The module has not been initialized */
-	AST_MODULE_RELOAD_NOT_IMPLEMENTED,  /*!< This module doesn't support reloading */
-};
-
-/*!
  * \brief Initialize the bridging system.
  * \since 12.0.0
  *
@@ -81,20 +67,6 @@
  * \retval -1 on error.
  */
 int ast_local_init(void);
-
-/*!
- * \brief Reload asterisk modules.
- * \param name the name of the module to reload
- *
- * This function reloads the specified module, or if no modules are specified,
- * it will reload all loaded modules.
- *
- * \note Modules are reloaded using their reload() functions, not unloading
- * them and loading them again.
- *
- * \retval The \ref ast_module_reload_result status of the module load request
- */
-enum ast_module_reload_result ast_module_reload(const char *name);
 
 /*!
  * \brief Process reload requests received during startup.

Modified: trunk/include/asterisk/module.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/module.h?view=diff&rev=429543&r1=429542&r2=429543
==============================================================================
--- trunk/include/asterisk/module.h (original)
+++ trunk/include/asterisk/module.h Fri Dec 12 17:57:50 2014
@@ -73,6 +73,20 @@
 	AST_MODULE_LOAD_FAILURE = -1,   /*!< Module could not be loaded properly */
 };
 
+/*!
+ * \since 12
+ * \brief Possible return types for \ref ast_module_reload
+ */
+enum ast_module_reload_result {
+	AST_MODULE_RELOAD_SUCCESS = 0,      /*!< The module was reloaded succesfully */
+	AST_MODULE_RELOAD_QUEUED,           /*!< The module reload request was queued */
+	AST_MODULE_RELOAD_NOT_FOUND,        /*!< The requested module was not found */
+	AST_MODULE_RELOAD_ERROR,            /*!< An error occurred while reloading the module */
+	AST_MODULE_RELOAD_IN_PROGRESS,      /*!< A module reload request is already in progress */
+	AST_MODULE_RELOAD_UNINITIALIZED,    /*!< The module has not been initialized */
+	AST_MODULE_RELOAD_NOT_IMPLEMENTED,  /*!< This module doesn't support reloading */
+};
+
 enum ast_module_support_level {
 	AST_MODULE_SUPPORT_UNKNOWN,
 	AST_MODULE_SUPPORT_CORE,
@@ -106,6 +120,20 @@
  * \retval -1 on error.
  */
 int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode);
+
+/*!
+ * \brief Reload asterisk modules.
+ * \param name the name of the module to reload
+ *
+ * This function reloads the specified module, or if no modules are specified,
+ * it will reload all loaded modules.
+ *
+ * \note Modules are reloaded using their reload() functions, not unloading
+ * them and loading them again.
+ *
+ * \retval The \ref ast_module_reload_result status of the module load request
+ */
+enum ast_module_reload_result ast_module_reload(const char *name);
 
 /*! 
  * \brief Notify when usecount has been changed.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=429543&r1=429542&r2=429543
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri Dec 12 17:57:50 2014
@@ -56,7 +56,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use various ast_config_AST_* */
 #include <ctype.h>
 #include <sys/time.h>