diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-31 21:00:20 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-31 21:00:20 +0000 |
commit | 73925ee14a02afb50f6c0aea3cc4e54f99493440 (patch) | |
tree | 5eac7fd790352b502dbbc4fc21ae517fe7c388ad /cdr/cdr_csv.c | |
parent | 43c75db33e757e08cdec37b1713a0e275d9a039b (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: http://svn.digium.com/svn/asterisk/trunk@41633 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr/cdr_csv.c')
-rw-r--r-- | cdr/cdr_csv.c | 9 |
1 files changed, 5 insertions, 4 deletions
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) { |