[asterisk-commits] seanbright: branch group/NoLossCDR-Redux2 r104138 - in /team/group/NoLossCDR-...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Feb 26 10:52:39 2008
New Revision: 104138

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104138
Log:
Compiling is good, m'kay?

Modified:
    team/group/NoLossCDR-Redux2/cdr/cdr_radius.c
    team/group/NoLossCDR-Redux2/cdr/cdr_sqlite.c
    team/group/NoLossCDR-Redux2/cdr/cdr_tds.c
    team/group/NoLossCDR-Redux2/res/res_config_sqlite.c

Modified: team/group/NoLossCDR-Redux2/cdr/cdr_radius.c
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/cdr/cdr_radius.c?view=diff&rev=104138&r1=104137&r2=104138
==============================================================================
--- team/group/NoLossCDR-Redux2/cdr/cdr_radius.c (original)
+++ team/group/NoLossCDR-Redux2/cdr/cdr_radius.c Tue Feb 26 10:52:39 2008
@@ -198,7 +198,7 @@
 	return 0;
 }
 
-static int radius_log(struct ast_cdr *cdr)
+static int radius_log(struct ast_cdr *cdr, void *data)
 {
 	int result = ERROR_RC;
 	VALUE_PAIR *send = NULL;
@@ -217,7 +217,8 @@
 
 static int unload_module(void)
 {
-	ast_cdr_unregister(name);
+	ast_cdr_unregister(name, NULL);
+
 	return 0;
 }
 
@@ -253,7 +254,7 @@
 		return AST_MODULE_LOAD_DECLINE;
 	}
 	
-	res = ast_cdr_register(name, desc, radius_log);
+	res = ast_cdr_register(name, NULL, desc, radius_log, NULL, NULL);
 	return AST_MODULE_LOAD_SUCCESS;
 }
 

Modified: team/group/NoLossCDR-Redux2/cdr/cdr_sqlite.c
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/cdr/cdr_sqlite.c?view=diff&rev=104138&r1=104137&r2=104138
==============================================================================
--- team/group/NoLossCDR-Redux2/cdr/cdr_sqlite.c (original)
+++ team/group/NoLossCDR-Redux2/cdr/cdr_sqlite.c Tue Feb 26 10:52:39 2008
@@ -87,7 +87,7 @@
 #endif
 ");";
 
-static int sqlite_log(struct ast_cdr *cdr)
+static int sqlite_log(struct ast_cdr *cdr, void *data)
 {
 	int res = 0;
 	char *zErr = 0;
@@ -163,7 +163,7 @@
 {
 	if (db)
 		sqlite_close(db);
-	ast_cdr_unregister(name);
+	ast_cdr_unregister(name, NULL);
 	return 0;
 }
 
@@ -198,7 +198,7 @@
 		/* TODO: here we should probably create an index */
 	}
 	
-	res = ast_cdr_register(name, ast_module_info->description, sqlite_log);
+	res = ast_cdr_register(name, NULL, ast_module_info->description, sqlite_log, NULL, NULL);
 	if (res) {
 		ast_log(LOG_ERROR, "Unable to register SQLite CDR handling\n");
 		return -1;

Modified: team/group/NoLossCDR-Redux2/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/cdr/cdr_tds.c?view=diff&rev=104138&r1=104137&r2=104138
==============================================================================
--- team/group/NoLossCDR-Redux2/cdr/cdr_tds.c (original)
+++ team/group/NoLossCDR-Redux2/cdr/cdr_tds.c Tue Feb 26 10:52:39 2008
@@ -101,7 +101,7 @@
 static int mssql_connect(void);
 static int mssql_disconnect(void);
 
-static int tds_log(struct ast_cdr *cdr)
+static int tds_log(struct ast_cdr *cdr, void *data)
 {
 	char sqlcmd[2048], start[80], answer[80], end[80];
 	char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid;
@@ -402,7 +402,7 @@
 {
 	mssql_disconnect();
 
-	ast_cdr_unregister(name);
+	ast_cdr_unregister(name, NULL);
 
 	if (hostname) ast_free(hostname);
 	if (dbname) ast_free(dbname);
@@ -515,7 +515,7 @@
 {
 	if (!tds_load_module(0))
 		return AST_MODULE_LOAD_DECLINE;
-	ast_cdr_register(name, ast_module_info->description, tds_log);
+	ast_cdr_register(name, NULL, ast_module_info->description, tds_log, NULL, NULL);
 	return AST_MODULE_LOAD_SUCCESS;
 }
 

Modified: team/group/NoLossCDR-Redux2/res/res_config_sqlite.c
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/res/res_config_sqlite.c?view=diff&rev=104138&r1=104137&r2=104138
==============================================================================
--- team/group/NoLossCDR-Redux2/res/res_config_sqlite.c (original)
+++ team/group/NoLossCDR-Redux2/res/res_config_sqlite.c Tue Feb 26 10:52:39 2008
@@ -654,7 +654,7 @@
 	cdr_table = NULL;
 }
 
-static int cdr_handler(struct ast_cdr *cdr)
+static int cdr_handler(struct ast_cdr *cdr, void *data)
 {
 	char *query, *errormsg;
 	int error;