diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-26 20:02:27 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-26 20:02:27 +0000 |
| commit | df53774db69f044643962a9f6af6290b3d2ee71d (patch) | |
| tree | 3713c05a6de35fa07fef058395c44f56f2b0e69d /apps/app_amd.c | |
| parent | 4d04a3258e50f0c5d5103bd9eef6cec335d93056 (diff) | |
Use defined return values in load_module in more places.
(closes issue #11096)
Patches:
pbx_config.c.patch uploaded by moy (license 222)
pbx_dundi.c.patch uploaded by moy (license 222)
pbx_gtkconsole.c.patch uploaded by moy (license 222)
pbx_loopback.c.patch uploaded by moy (license 222)
pbx_realtime.c.patch uploaded by moy (license 222)
pbx_spool.c.patch uploaded by moy (license 222)
app_adsiprog.c.patch uploaded by moy (license 222)
app_alarmreceiver.c.patch uploaded by moy (license 222)
app_amd.c.patch uploaded by moy (license 222)
app_authenticate.c.patch uploaded by moy (license 222)
app_cdr.c.patch uploaded by moy (license 222)
app_zapateller.c.patch uploaded by moy (license 222)
app_zapbarge.c.patch uploaded by moy (license 222)
app_zapras.c.patch uploaded by moy (license 222)
app_zapscan.c.patch uploaded by moy (license 222)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@94806 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_amd.c')
| -rw-r--r-- | apps/app_amd.c | 20 |
1 files changed, 12 insertions, 8 deletions
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", |