diff options
-rw-r--r-- | apps/app_adsiprog.c | 4 | ||||
-rw-r--r-- | apps/app_alarmreceiver.c | 7 | ||||
-rw-r--r-- | apps/app_amd.c | 20 | ||||
-rw-r--r-- | apps/app_authenticate.c | 4 | ||||
-rw-r--r-- | apps/app_cdr.c | 4 | ||||
-rw-r--r-- | apps/app_zapateller.c | 2 | ||||
-rw-r--r-- | apps/app_zapbarge.c | 2 | ||||
-rw-r--r-- | apps/app_zapras.c | 2 | ||||
-rw-r--r-- | apps/app_zapscan.c | 2 | ||||
-rw-r--r-- | pbx/pbx_config.c | 7 | ||||
-rw-r--r-- | pbx/pbx_dundi.c | 4 | ||||
-rw-r--r-- | pbx/pbx_gtkconsole.c | 6 | ||||
-rw-r--r-- | pbx/pbx_loopback.c | 5 | ||||
-rw-r--r-- | pbx/pbx_realtime.c | 5 | ||||
-rw-r--r-- | pbx/pbx_spool.c | 6 |
15 files changed, 47 insertions, 33 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 118b5a107..1b09ce7b5 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -1573,7 +1573,9 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(app, adsi_exec, synopsis, descrip); + if (ast_register_application(app, adsi_exec, synopsis, descrip)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application"); diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index 5a990d9d5..c4fa81109 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -801,8 +801,11 @@ static int unload_module(void) static int load_module(void) { - if(load_config()) - return ast_register_application(app, alarmreceiver_exec, synopsis, descrip); + if(load_config()) { + if (ast_register_application(app, alarmreceiver_exec, synopsis, descrip)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; + } else return AST_MODULE_LOAD_DECLINE; } diff --git a/apps/app_amd.c b/apps/app_amd.c index 70390f038..556fceec6 100644 --- a/apps/app_amd.c +++ b/apps/app_amd.c @@ -308,7 +308,7 @@ static int amd_exec(struct ast_channel *chan, void *data) return 0; } -static void load_config(int reload) +static int load_config(int reload) { struct ast_config *cfg = NULL; char *cat = NULL; @@ -317,9 +317,9 @@ static void load_config(int reload) if (!(cfg = ast_config_load("amd.conf", config_flags))) { ast_log(LOG_ERROR, "Configuration file amd.conf missing.\n"); - return; + return -1; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + return 0; cat = ast_category_browse(cfg, NULL); @@ -360,7 +360,7 @@ static void load_config(int reload) dfltInitialSilence, dfltGreeting, dfltAfterGreetingSilence, dfltTotalAnalysisTime, dfltMinimumWordLength, dfltBetweenWordsSilence, dfltMaximumNumberOfWords, dfltSilenceThreshold ); - return; + return 0; } static int unload_module(void) @@ -370,14 +370,18 @@ static int unload_module(void) static int load_module(void) { - load_config(0); - return ast_register_application(app, amd_exec, synopsis, descrip); + if (load_config(0)) + return AST_MODULE_LOAD_DECLINE; + if (ast_register_application(app, amd_exec, synopsis, descrip)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } static int reload(void) { - load_config(1); - return 0; + if (load_config(1)) + return AST_MODULE_LOAD_DECLINE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application", diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 1a49bf337..3a3e7582e 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -204,7 +204,9 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(app, auth_exec, synopsis, descrip); + if (ast_register_application(app, auth_exec, synopsis, descrip)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Authentication Application"); diff --git a/apps/app_cdr.c b/apps/app_cdr.c index 86b1db219..7804a806b 100644 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -55,7 +55,9 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip); + if (ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Tell Asterisk to not maintain a CDR for the current call"); diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index 74c458c55..2641e69b4 100644 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -107,7 +107,7 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(app, zapateller_exec, synopsis, descrip); + return ((ast_register_application(app, zapateller_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS); } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone"); diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 9e2ff67fc..bb8c4cbb3 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -293,7 +293,7 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(app, conf_exec, synopsis, descrip); + return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS); } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on Zap channel application"); diff --git a/apps/app_zapras.c b/apps/app_zapras.c index bc3b51dba..480e5f643 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -231,7 +231,7 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(app, zapras_exec, synopsis, descrip); + return ((ast_register_application(app, zapras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS); } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Zaptel ISDN Remote Access Server"); diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index 99f24b8a9..5367d99d1 100644 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -356,7 +356,7 @@ static int unload_module(void) static int load_module(void) { - return ast_register_application(app, conf_exec, synopsis, descrip); + return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS); } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Scan Zap channels application"); diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 5c97f8bf7..4a7a3d368 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1639,7 +1639,7 @@ static int pbx_load_module(void) pbx_set_autofallthrough(autofallthrough_config); pbx_set_extenpatternmatchnew(extenpatternmatchnew_config); - return 0; + return AST_MODULE_LOAD_SUCCESS; } static int load_module(void) @@ -1651,15 +1651,14 @@ static int load_module(void) ast_cli_register(&cli_dialplan_save); ast_cli_register_multiple(cli_pbx_config, sizeof(cli_pbx_config) / sizeof(struct ast_cli_entry)); - return 0; + return AST_MODULE_LOAD_SUCCESS; } static int reload(void) { if (clearglobalvars_config) pbx_builtin_clear_globals(); - pbx_load_module(); - return 0; + return pbx_load_module(); } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration", diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index fe1fec749..62e55abf9 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -4779,9 +4779,9 @@ static int reload(void) struct sockaddr_in sin; if (set_config("dundi.conf", &sin, 1)) - return -1; + return AST_MODULE_LOAD_FAILURE; - return 0; + return AST_MODULE_LOAD_SUCCESS; } static int load_module(void) diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index 9017d7459..2cf466526 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -230,7 +230,7 @@ static int reload_module(void *mod) } } - return 0; + return AST_MODULE_LOAD_SUCCESS; } static void file_ok_sel(GtkWidget *w, GtkFileSelection *fs) @@ -473,7 +473,7 @@ static int load_module(void *mod) { if (pipe(clipipe)) { ast_log(LOG_WARNING, "Unable to create CLI pipe\n"); - return -1; + return AST_MODULE_LOAD_FAILURE; } g_thread_init(NULL); if (gtk_init_check(NULL, NULL)) { @@ -489,7 +489,7 @@ static int load_module(void *mod) else ast_verb(2, "GTK is not available -- skipping monitor\n"); } - return 0; + return AST_MODULE_LOAD_SUCCESS; } static const char *description(void) diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index 11fe8c3ff..e6f4ed904 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -168,8 +168,9 @@ static int unload_module(void) static int load_module(void) { - ast_register_switch(&loopback_switch); - return 0; + if (ast_register_switch(&loopback_switch)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Loopback Switch"); diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 0b122b04c..6b9a0fbff 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -243,8 +243,9 @@ static int unload_module(void) static int load_module(void) { - ast_register_switch(&realtime_switch); - return 0; + if (ast_register_switch(&realtime_switch)) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Realtime Switch"); diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index c4cd739ad..113fc2b73 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -494,16 +494,16 @@ static int load_module(void) snprintf(qdir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing"); if (ast_mkdir(qdir, 0777)) { ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir); - return 0; + return AST_MODULE_LOAD_DECLINE; } snprintf(qdonedir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing_done"); if ((ret = ast_pthread_create_detached_background(&thread, NULL, scan_thread, NULL))) { ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret); - return -1; + return AST_MODULE_LOAD_FAILURE; } - return 0; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Outgoing Spool Support"); |