diff options
author | George Joseph <george.joseph@fairview5.com> | 2014-12-12 23:54:45 +0000 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2014-12-12 23:54:45 +0000 |
commit | 2b8c4410964ef037450626099c65636340190312 (patch) | |
tree | 8d78a367a304774cea066405872f912a7304e753 | |
parent | 8f12ded8871a68f3e6bbbcf7665c916c01295912 (diff) |
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/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | include/asterisk/_private.h | 28 | ||||
-rw-r--r-- | include/asterisk/module.h | 28 | ||||
-rw-r--r-- | main/manager.c | 1 |
3 files changed, 28 insertions, 29 deletions
diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h index 01a8352fc..5c80bf0e9 100644 --- a/include/asterisk/_private.h +++ b/include/asterisk/_private.h @@ -51,20 +51,6 @@ void ast_msg_shutdown(void); /*!< Provided by message.c */ 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 * @@ -83,20 +69,6 @@ int ast_bridging_init(void); 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. * * This function requests that the loader execute the pending reload requests diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 7f9cecf2d..d6e1d9039 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -73,6 +73,20 @@ enum ast_module_load_result { 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, @@ -107,6 +121,20 @@ enum ast_module_load_result ast_load_resource(const char *resource_name); */ 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. * diff --git a/main/manager.c b/main/manager.c index 31c541085..9266141f7 100644 --- a/main/manager.c +++ b/main/manager.c @@ -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> |