From 0fa6826a803fff200ecdd83008cc42bdfbc307b3 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sat, 27 Oct 2012 11:20:34 -0500 Subject: [PATCH] trivial compiler warning fix + vs2010 reswig --- .../mod_managed/freeswitch_wrap.2010.cxx | 22 +++++++++++++---- .../mod_managed/managed/swig.2010.cs | 24 ++++++++++++------- src/switch_core_sqldb.c | 2 +- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx index e76d081416..3183c52bb2 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx @@ -11064,13 +11064,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_preprocess_session(void * jarg1, ch } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_stop_thread() { - switch_core_sqldb_stop_thread(); +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_pause() { + switch_core_sqldb_pause(); } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_start_thread() { - switch_core_sqldb_start_thread(); +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_sqldb_resume() { + switch_core_sqldb_resume(); } @@ -11986,6 +11986,20 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_recovery_flush(char * jarg1, char } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_size(void * jarg1, unsigned long jarg2) { + int jresult ; + switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ; + uint32_t arg2 ; + int result; + + arg1 = (switch_sql_queue_manager_t *)jarg1; + arg2 = (uint32_t)jarg2; + result = (int)switch_sql_queue_manager_size(arg1,arg2); + jresult = result; + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_push_confirm(void * jarg1, char * jarg2, unsigned long jarg3, int jarg4) { int jresult ; switch_sql_queue_manager_t *arg1 = (switch_sql_queue_manager_t *) 0 ; diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs index 5fa0f55fbe..a5ec72534d 100644 --- a/src/mod/languages/mod_managed/managed/swig.2010.cs +++ b/src/mod/languages/mod_managed/managed/swig.2010.cs @@ -2642,12 +2642,12 @@ public class freeswitch { return ret; } - public static void switch_core_sqldb_stop_thread() { - freeswitchPINVOKE.switch_core_sqldb_stop_thread(); + public static void switch_core_sqldb_pause() { + freeswitchPINVOKE.switch_core_sqldb_pause(); } - public static void switch_core_sqldb_start_thread() { - freeswitchPINVOKE.switch_core_sqldb_start_thread(); + public static void switch_core_sqldb_resume() { + freeswitchPINVOKE.switch_core_sqldb_resume(); } public static string switch_cache_db_type_name(switch_cache_db_handle_type_t type) { @@ -2842,6 +2842,11 @@ public class freeswitch { freeswitchPINVOKE.switch_core_recovery_flush(technology, profile_name); } + public static int switch_sql_queue_manager_size(SWIGTYPE_p_switch_sql_queue_manager qm, uint index) { + int ret = freeswitchPINVOKE.switch_sql_queue_manager_size(SWIGTYPE_p_switch_sql_queue_manager.getCPtr(qm), index); + return ret; + } + public static switch_status_t switch_sql_queue_manager_push_confirm(SWIGTYPE_p_switch_sql_queue_manager qm, string sql, uint pos, switch_bool_t dup) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_sql_queue_manager_push_confirm(SWIGTYPE_p_switch_sql_queue_manager.getCPtr(qm), sql, pos, (int)dup); return ret; @@ -9296,11 +9301,11 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_preprocess_session")] public static extern int switch_ivr_preprocess_session(HandleRef jarg1, string jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_sqldb_stop_thread")] - public static extern void switch_core_sqldb_stop_thread(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_sqldb_pause")] + public static extern void switch_core_sqldb_pause(); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_sqldb_start_thread")] - public static extern void switch_core_sqldb_start_thread(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_sqldb_resume")] + public static extern void switch_core_sqldb_resume(); [DllImport("mod_managed", EntryPoint="CSharp_CACHE_DB_LEN_get")] public static extern int CACHE_DB_LEN_get(); @@ -9524,6 +9529,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_core_recovery_flush")] public static extern void switch_core_recovery_flush(string jarg1, string jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_sql_queue_manager_size")] + public static extern int switch_sql_queue_manager_size(HandleRef jarg1, uint jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_sql_queue_manager_push_confirm")] public static extern int switch_sql_queue_manager_push_confirm(HandleRef jarg1, string jarg2, uint jarg3, int jarg4); diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 708577d823..728f650bb7 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -1594,7 +1594,7 @@ static void *SWITCH_THREAD_FUNC switch_user_sql_thread(switch_thread_t *thread, while (qm->thread_running == 1) { int lc; - int i; + uint32_t i; uint32_t iterations = 0; if (sql_manager.paused) {