diff options
| author | Corey Farrell <git@cfware.com> | 2017-12-29 03:57:17 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2018-01-24 13:37:29 -0500 |
| commit | 527cf5a57033820313356414b971fdf0f4382b21 (patch) | |
| tree | 44810fb922062b5c2879cad1e9cb49b6d8772a80 /funcs | |
| parent | 7ce34f4e6a8a2bbfc3cfac9a4465eb0f71372205 (diff) | |
Remove redundant module checks and references.
This removes references that are no longer needed due to automatic
references created by module dependencies.
In addition this removes most calls to ast_module_check as they were
checking modules which are listed as dependencies.
Change-Id: I332a6e8383d4c72c8e89d988a184ab8320c4872e
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_curl.c | 8 | ||||
| -rw-r--r-- | funcs/func_periodic_hook.c | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/funcs/func_curl.c b/funcs/func_curl.c index ebb3dce23..682ad5a42 100644 --- a/funcs/func_curl.c +++ b/funcs/func_curl.c @@ -920,13 +920,6 @@ static int load_module(void) { int res; - if (!ast_module_check("res_curl.so")) { - if (ast_load_resource("res_curl.so") != AST_MODULE_LOAD_SUCCESS) { - ast_log(LOG_ERROR, "Cannot load res_curl, so func_curl cannot be loaded\n"); - return AST_MODULE_LOAD_DECLINE; - } - } - res = ast_custom_function_register_escalating(&acf_curl, AST_CFE_WRITE); res |= ast_custom_function_register(&acf_curlopt); @@ -940,4 +933,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Load external URL", .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_REALTIME_DEPEND2, + .requires = "res_curl", ); diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c index 958da9728..1f66747c3 100644 --- a/funcs/func_periodic_hook.c +++ b/funcs/func_periodic_hook.c @@ -486,11 +486,6 @@ static int load_module(void) res = ast_custom_function_register_escalating(&hook_function, AST_CFE_BOTH); - if (!res) { - /* For Optional API. */ - ast_module_shutdown_ref(AST_MODULE_SELF); - } - return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS; } |