From 05a695af721cb8002f3d462c6952f45f0e9c5d9e Mon Sep 17 00:00:00 2001 From: Matt O'Gorman Date: Thu, 31 Aug 2006 21:00:20 +0000 Subject: 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 --- cdr/cdr_csv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cdr/cdr_csv.c') diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index a599fb08f..5e88563b7 100644 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -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) { -- cgit v1.2.3