[Asterisk-cvs] asterisk/cdr cdr_manager.c, 1.1, 1.2 cdr_odbc.c, 1.22, 1.23 cdr_pgsql.c, 1.13, 1.14 cdr_tds.c, 1.4, 1.5

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/cdr
In directory mongoose.digium.com:/tmp/cvs-serv27198/cdr

Modified Files:
	cdr_manager.c cdr_odbc.c cdr_pgsql.c cdr_tds.c 
Log Message:
Merge config updates (bug #3406)


Index: cdr_manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_manager.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cdr_manager.c	25 Jul 2004 14:56:34 -0000	1.1
+++ cdr_manager.c	25 Jan 2005 06:10:19 -0000	1.2
@@ -36,7 +36,7 @@
 	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 @@
 		cat = ast_category_browse(cfg, cat);
 	}
 	
-	ast_destroy(cfg);
+	ast_config_destroy(cfg);
 }
 
 static int manager_log(struct ast_cdr *cdr)

Index: cdr_odbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_odbc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cdr_odbc.c	15 Jan 2005 09:01:52 -0000	1.22
+++ cdr_odbc.c	25 Jan 2005 06:10:19 -0000	1.23
@@ -231,7 +231,7 @@
 
 	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 @@
 		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);

Index: cdr_pgsql.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_pgsql.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cdr_pgsql.c	12 Dec 2004 23:34:24 -0000	1.13
+++ cdr_pgsql.c	25 Jan 2005 06:10:19 -0000	1.14
@@ -330,13 +330,13 @@
 {
 	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;
 }
 

Index: cdr_tds.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/cdr_tds.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cdr_tds.c	13 Aug 2004 20:27:58 -0000	1.4
+++ cdr_tds.c	25 Jan 2005 06:10:19 -0000	1.5
@@ -391,7 +391,7 @@
 	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 @@
 		language = strdupa("us_english");
 	}
 
-	ast_destroy(cfg);
+	ast_config_destroy(cfg);
 
 	/* Connect to M$SQL Server */
 	if (!(login = tds_alloc_login()))