kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +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

8
cdr/cdr_manager.c
View File

@@ -49,7 +49,7 @@ static char *name = "cdr_manager";
static int enablecdr = 0;
static void loadconfigurationfile(void)
static int loadconfigurationfile(void)
{
char *cat;
struct ast_config *cfg;
@@ -59,7 +59,7 @@ static void loadconfigurationfile(void)
if (!cfg) {
/* Standard configuration */
enablecdr = 0;
return;
return 0;
}
cat = ast_category_browse(cfg, NULL);
@@ -80,6 +80,7 @@ static void loadconfigurationfile(void)
}
ast_config_destroy(cfg);
return 1;
}
static int manager_log(struct ast_cdr *cdr)
@@ -145,7 +146,8 @@ static int load_module(void)
int res;
/* Configuration file */
loadconfigurationfile();
if(loadconfigurationfile())
return AST_MODULE_LOAD_DECLINE;
res = ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log);
if (res) {