kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

everything that loads a config that needs a config file to run

Browse Source 
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
This commit is contained in:
Matt O'Gorman
2006-08-31 21:00:20 +00:00
parent f2b836ff4f
commit 05a695af72
35 changed files with 418 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_alarmreceiver.c
View File

@@ -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");