diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
commit | 2207b9a515214bf72785eabf75bd587bd7df23e8 (patch) | |
tree | 5e740f79246c281ef1bc43bcffc87fd21f676005 /cdr | |
parent | c7f2030d7977ded782c6430a33e57bbbb69cd6df (diff) |
Merge config updates (bug #3406)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
-rwxr-xr-x | cdr/cdr_manager.c | 4 | ||||
-rwxr-xr-x | cdr/cdr_odbc.c | 4 | ||||
-rwxr-xr-x | cdr/cdr_pgsql.c | 4 | ||||
-rwxr-xr-x | cdr/cdr_tds.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 1ebc58e73..110aebadc 100755 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -36,7 +36,7 @@ static void loadconfigurationfile(void) struct ast_config *cfg; struct ast_variable *v; - cfg = ast_load(CONF_FILE); + cfg = ast_config_load(CONF_FILE); if (!cfg) { /* Standard configuration */ enablecdr = 0; @@ -60,7 +60,7 @@ static void loadconfigurationfile(void) cat = ast_category_browse(cfg, cat); } - ast_destroy(cfg); + ast_config_destroy(cfg); } static int manager_log(struct ast_cdr *cdr) diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index 9bc2a877b..f9f0ce70f 100755 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -231,7 +231,7 @@ static int odbc_load_module(void) ast_mutex_lock(&odbc_lock); - cfg = ast_load(config); + cfg = ast_config_load(config); if (!cfg) { ast_log(LOG_WARNING, "cdr_odbc: Unable to load config for ODBC CDR's: %s\n", config); goto out; @@ -331,7 +331,7 @@ static int odbc_load_module(void) table = "cdr"; } - ast_destroy(cfg); + ast_config_destroy(cfg); if (option_verbose > 2) { ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: dsn is %s\n",dsn); ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: username is %s\n",username); diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 65e045402..efad07c7b 100755 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -330,13 +330,13 @@ static int my_load_module(void) { struct ast_config *cfg; int res; - cfg = ast_load(config); + cfg = ast_config_load(config); if (!cfg) { ast_log(LOG_WARNING, "Unable to load config for PostgreSQL CDR's: %s\n", config); return 0; } res = process_my_load_module(cfg); - ast_destroy(cfg); + ast_config_destroy(cfg); return res; } diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 448c02495..15a7be84d 100755 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -391,7 +391,7 @@ int load_module(void) TDS_INT result_type; #endif - cfg = ast_load(config); + cfg = ast_config_load(config); if (!cfg) { ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDR's: %s\n", config); @@ -462,7 +462,7 @@ int load_module(void) language = strdupa("us_english"); } - ast_destroy(cfg); + ast_config_destroy(cfg); /* Connect to M$SQL Server */ if (!(login = tds_alloc_login())) |