Revision

15489

Author

jlenk

Date

2009-11-16 19:31:12 -0600 (Mon, 16 Nov 2009)

Log Message

fix compiler error

Modified Paths

• freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c
• freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
• freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
• freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c

Diff

--- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c	2009-11-17 01:09:11 UTC (rev 15488)
+++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c	2009-11-17 01:31:12 UTC (rev 15489)
@@ -204,7 +204,7 @@
 		switch_mutex_lock(globals.mutex);
 	}
 	/* Do the Query */
-	if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, route_callback, &pdata) == SWITCH_ODBC_SUCCESS){
+	if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, route_callback, &pdata, NULL) == SWITCH_ODBC_SUCCESS){
 		char tmp_profile[129];
 		char tmp_gateway[129];
 

--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	2009-11-17 01:09:11 UTC (rev 15488)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	2009-11-17 01:31:12 UTC (rev 15489)
@@ -526,7 +526,7 @@
 	
 	switch_mutex_lock(globals.db_mutex);
 	if (globals.odbc_dsn) {
-		if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata)
+		if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata, NULL)
 				== SWITCH_ODBC_FAIL) {
 			retval = SWITCH_FALSE;
 		} else {

--- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	2009-11-17 01:09:11 UTC (rev 15488)
+++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	2009-11-17 01:31:12 UTC (rev 15489)
@@ -338,7 +338,7 @@
 	memset(&pdata, 0, sizeof(pdata));
 	snprintf(sql, 1024, SQL_LOOKUP, globals.db_column_cash, globals.db_table, globals.db_column_account, billaccount);
 
-	if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata) != SWITCH_ODBC_SUCCESS) {
+	if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata, NULL) != SWITCH_ODBC_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", sql);
 		/* Return -1 for safety */
 

--- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c	2009-11-17 01:09:11 UTC (rev 15488)
+++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c	2009-11-17 01:31:12 UTC (rev 15489)
@@ -1319,11 +1319,13 @@
 
 void do_index(switch_stream_handle_t *stream)
 {
-	switch_core_db_t *db = switch_core_db_handle();
+	switch_cache_db_handle_t *db; 
 	const char *sql = "select * from channels";
 	struct holder holder;
 	char *errmsg;
 
+	switch_core_db_handle(&db);
+
 	holder.host = switch_event_get_header(stream->param_event, "http-host");
 	holder.port = switch_event_get_header(stream->param_event, "http-port");
 	holder.uri = switch_event_get_header(stream->param_event, "http-uri");
@@ -1335,7 +1337,7 @@
 						   "<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
 						   "Created", "CID Name", "CID Num", "Ext", "App", "Data", "Codec", "Rate", "Listen");
 
-	switch_core_db_exec(db, sql, web_callback, &holder, &errmsg);
+	switch_cache_db_execute_sql_callback(db, sql, web_callback, &holder, &errmsg);
 
 	stream->write_function(stream, "</table>");