fix compiler error
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15489 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
a34e3f76d2
commit
67b3210a31
|
@ -204,7 +204,7 @@ static switch_status_t route_lookup(char *dn, easyroute_results_t *results, int
|
||||||
switch_mutex_lock(globals.mutex);
|
switch_mutex_lock(globals.mutex);
|
||||||
}
|
}
|
||||||
/* Do the Query */
|
/* 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_profile[129];
|
||||||
char tmp_gateway[129];
|
char tmp_gateway[129];
|
||||||
|
|
||||||
|
|
|
@ -526,7 +526,7 @@ static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback
|
||||||
|
|
||||||
switch_mutex_lock(globals.db_mutex);
|
switch_mutex_lock(globals.db_mutex);
|
||||||
if (globals.odbc_dsn) {
|
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) {
|
== SWITCH_ODBC_FAIL) {
|
||||||
retval = SWITCH_FALSE;
|
retval = SWITCH_FALSE;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -338,7 +338,7 @@ static float get_balance(const char *billaccount)
|
||||||
memset(&pdata, 0, sizeof(pdata));
|
memset(&pdata, 0, sizeof(pdata));
|
||||||
snprintf(sql, 1024, SQL_LOOKUP, globals.db_column_cash, globals.db_table, globals.db_column_account, billaccount);
|
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);
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", sql);
|
||||||
/* Return -1 for safety */
|
/* Return -1 for safety */
|
||||||
|
|
||||||
|
|
|
@ -1319,11 +1319,13 @@ void do_broadcast(switch_stream_handle_t *stream)
|
||||||
|
|
||||||
void do_index(switch_stream_handle_t *stream)
|
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";
|
const char *sql = "select * from channels";
|
||||||
struct holder holder;
|
struct holder holder;
|
||||||
char *errmsg;
|
char *errmsg;
|
||||||
|
|
||||||
|
switch_core_db_handle(&db);
|
||||||
|
|
||||||
holder.host = switch_event_get_header(stream->param_event, "http-host");
|
holder.host = switch_event_get_header(stream->param_event, "http-host");
|
||||||
holder.port = switch_event_get_header(stream->param_event, "http-port");
|
holder.port = switch_event_get_header(stream->param_event, "http-port");
|
||||||
holder.uri = switch_event_get_header(stream->param_event, "http-uri");
|
holder.uri = switch_event_get_header(stream->param_event, "http-uri");
|
||||||
|
@ -1335,7 +1337,7 @@ void do_index(switch_stream_handle_t *stream)
|
||||||
"<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",
|
"<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");
|
"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>");
|
stream->write_function(stream, "</table>");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue