diff options
author | Matt O'Gorman <mogorman@digium.com> | 2006-08-31 21:00:20 +0000 |
---|---|---|
committer | Matt O'Gorman <mogorman@digium.com> | 2006-08-31 21:00:20 +0000 |
commit | 05a695af721cb8002f3d462c6952f45f0e9c5d9e (patch) | |
tree | 5eac7fd790352b502dbbc4fc21ae517fe7c388ad /apps/app_alarmreceiver.c | |
parent | f2b836ff4f9f34c48f36b9aca18c633834dc0ace (diff) |
everything that loads a config that needs a config file to run
now reports AST_MODULE_LOAD_DECLINE when loading if config file
is not there, also fixed an error in res_config_pgsql where it
had a non static function when it should.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_alarmreceiver.c')
-rw-r--r-- | apps/app_alarmreceiver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index 5b745d0ab..41f715e8e 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -743,6 +743,7 @@ static int load_config(void) if(option_verbose >= 4) ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: No config file\n"); + return 0; } else{ @@ -809,7 +810,7 @@ static int load_config(void) } ast_config_destroy(cfg); } - return 0; + return 1; } @@ -831,8 +832,10 @@ static int unload_module(void) static int load_module(void) { - load_config(); - return ast_register_application(app, alarmreceiver_exec, synopsis, descrip); + if(load_config()) + return ast_register_application(app, alarmreceiver_exec, synopsis, descrip); + else + return AST_MODULE_LOAD_DECLINE; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Alarm Receiver for Asterisk"); |