kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +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
cdr/cdr_csv.c
View File

@@ -108,13 +108,13 @@ static int load_config(void)
if (!cfg) {
ast_log(LOG_WARNING, "unable to load config: %s\n", config);
return -1;
return 0;
}
var = ast_variable_browse(cfg, "csv");
if (!var) {
ast_config_destroy(cfg);
return -1;
return 0;
}
tmp = ast_variable_retrieve(cfg, "csv", "usegmtime");
@@ -142,7 +142,7 @@ static int load_config(void)
}
ast_config_destroy(cfg);
return 0;
return 1;
}
static int append_string(char *buf, char *s, size_t bufsize)
@@ -321,7 +321,8 @@ static int load_module(void)
{
int res;
load_config();
if(!load_config())
return AST_MODULE_LOAD_DECLINE;
res = ast_cdr_register(name, ast_module_info->description, csv_log);
if (res) {