summaryrefslogtreecommitdiff
path: root/res/res_odbc.c
diff options
context:
space:
mode:
authorAlexander Traud <pabstraud@compuserve.com>2018-01-05 14:44:55 +0100
committerRichard Mudgett <rmudgett@digium.com>2018-01-06 20:13:07 -0600
commit7e9781c25e59be8462ac6cc4d3a8914aca42d16f (patch)
tree5b264511e7eaadb4c5c2bc1e43802e345c40e845 /res/res_odbc.c
parent09f339bda56d08a1b78359bcabaf2f9cc3234b03 (diff)
General: Silence modules on (un)load.
Some (normally optional) modules created notices, warnings, and even errors in normal situations like (un)load. This cluttered the command-line interface (CLI) on start and while stopping gracefully. However, when an user went for the script './contrib/scripts/install_prereq', those modules get compiled-in because their prerequisites were met at compile time. Furthermore, because of ASTERISK_27475, the former talkative module 'res_curl' is built as side-effect. ASTERISK-27553 Change-Id: I9f105f46d72553994e820679bfde3478a551b281
Diffstat (limited to 'res/res_odbc.c')
-rw-r--r--res/res_odbc.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 7aa452452..4a5411e7e 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1001,16 +1001,6 @@ static int unload_module(void)
return -1;
}
-/*!
- * \brief Load the module
- *
- * Module loading including tests for configuration or dependencies.
- * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
- * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
- * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
- * configuration file or other non-critical problem return
- * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
- */
static int load_module(void)
{
if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr)))
@@ -1018,8 +1008,7 @@ static int load_module(void)
if (load_odbc_config() == -1)
return AST_MODULE_LOAD_DECLINE;
ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
- ast_log(LOG_NOTICE, "res_odbc loaded.\n");
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource",