kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-06 18:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge config updates (bug #3406)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cdr/cdr_manager.c
View File

@@ -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)

4
cdr/cdr_odbc.c
View File

@@ -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);

4
cdr/cdr_pgsql.c
View File

@@ -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;
}

4
cdr/cdr_tds.c
View File

@@ -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()))