Author: gtjoseph Date: Fri Dec 12 17:54:45 2014 New Revision: 429542 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429542 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/ Modified: branches/13/include/asterisk/_private.h branches/13/include/asterisk/module.h branches/13/main/manager.c Modified: branches/13/include/asterisk/_private.h URL: http://svnview.digium.com/svn/asterisk/branches/13/include/asterisk/_private.h?view=diff&rev=429542&r1=429541&r2=429542 ============================================================================== --- branches/13/include/asterisk/_private.h (original) +++ branches/13/include/asterisk/_private.h Fri Dec 12 17:54:45 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: branches/13/include/asterisk/module.h URL: http://svnview.digium.com/svn/asterisk/branches/13/include/asterisk/module.h?view=diff&rev=429542&r1=429541&r2=429542 ============================================================================== --- branches/13/include/asterisk/module.h (original) +++ branches/13/include/asterisk/module.h Fri Dec 12 17:54:45 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: branches/13/main/manager.c URL: http://svnview.digium.com/svn/asterisk/branches/13/main/manager.c?view=diff&rev=429542&r1=429541&r2=429542 ============================================================================== --- branches/13/main/manager.c (original) +++ branches/13/main/manager.c Fri Dec 12 17:54:45 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> -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
