From 6ea577d747dc30585aeb74da26939b531510308e Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 21 Nov 2008 19:15:47 +0000
Subject: [PATCH] change types
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10502 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
src/include/switch_cpp.h | 2 +-
.../src/org/freeswitch/swig/freeswitch.java | 4 ++--
.../languages/mod_java/switch_swig_wrap.cpp | 10 ++------
src/mod/languages/mod_lua/mod_lua_wrap.cpp | 12 +++-------
.../languages/mod_managed/freeswitch_wrap.cxx | 6 ++---
src/mod/languages/mod_perl/mod_perl_wrap.cpp | 24 ++++++++-----------
.../languages/mod_python/mod_python_wrap.cpp | 24 +++++++------------
src/switch_cpp.cpp | 2 +-
8 files changed, 30 insertions(+), 54 deletions(-)
diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index 80a73ef2c0..ce64a2e047 100644
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -373,7 +373,7 @@ SWITCH_DECLARE(void) consoleCleanLog(char *msg);
SWITCH_DECLARE(void) console_log(char *level_str, char *msg);
SWITCH_DECLARE(void) console_clean_log(char *msg);
-SWITCH_DECLARE(void) msleep(uint32_t ms);
+SWITCH_DECLARE(void) msleep(unsigned ms);
/** \brief bridge the audio of session_b into session_a
*
diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
index c8b05b8ab1..7b53db475c 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
@@ -25,8 +25,8 @@ public class freeswitch {
freeswitchJNI.console_clean_log(msg);
}
- public static void msleep(SWIGTYPE_p_uint32_t ms) {
- freeswitchJNI.msleep(SWIGTYPE_p_uint32_t.getCPtr(ms));
+ public static void msleep(long ms) {
+ freeswitchJNI.msleep(ms);
}
public static void bridge(CoreSession session_a, CoreSession session_b) {
diff --git a/src/mod/languages/mod_java/switch_swig_wrap.cpp b/src/mod/languages/mod_java/switch_swig_wrap.cpp
index e4a391a1d4..05e0568772 100644
--- a/src/mod/languages/mod_java/switch_swig_wrap.cpp
+++ b/src/mod/languages/mod_java/switch_swig_wrap.cpp
@@ -3033,17 +3033,11 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_console_1clean_1l
SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_msleep(JNIEnv *jenv, jclass jcls, jlong jarg1) {
- uint32_t arg1 ;
- uint32_t *argp1 ;
+ unsigned int arg1 ;
(void)jenv;
(void)jcls;
- argp1 = *(uint32_t **)&jarg1;
- if (!argp1) {
- SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null uint32_t");
- return ;
- }
- arg1 = *argp1;
+ arg1 = (unsigned int)jarg1;
msleep(arg1);
}
diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index 433fd1fba6..e4275c9eaa 100644
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -6793,17 +6793,11 @@ fail:
static int _wrap_msleep(lua_State* L) {
int SWIG_arg = -1;
- uint32_t arg1 ;
- uint32_t *argp1 ;
+ unsigned int arg1 ;
SWIG_check_num_args("msleep",1,1)
- if(!lua_isuserdata(L,1)) SWIG_fail_arg("msleep",1,"uint32_t");
-
- if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&argp1,SWIGTYPE_p_uint32_t,0))){
- SWIG_fail_ptr("msleep",1,SWIGTYPE_p_uint32_t);
- }
- arg1 = *argp1;
-
+ if(!lua_isnumber(L,1)) SWIG_fail_arg("msleep",1,"unsigned int");
+ arg1 = (unsigned int)lua_tonumber(L, 1);
msleep(arg1);
SWIG_arg=0;
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index b2fc701ce3..25796b2e05 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -26839,10 +26839,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_console_clean_log(char * jarg1) {
}
-SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned long jarg1) {
- uint32_t arg1 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned int jarg1) {
+ unsigned int arg1 ;
- arg1 = (uint32_t)jarg1;
+ arg1 = (unsigned int)jarg1;
msleep(arg1);
}
diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
index 69381edf3e..51a1b893a3 100644
--- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp
+++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
@@ -8970,30 +8970,26 @@ XS(_wrap_console_clean_log) {
XS(_wrap_msleep) {
{
- uint32_t arg1 ;
- void *argp1 ;
- int res1 = 0 ;
+ unsigned int arg1 ;
+ unsigned int val1 ;
+ int ecode1 = 0 ;
int argvi = 0;
dXSARGS;
if ((items < 1) || (items > 1)) {
SWIG_croak("Usage: msleep(ms);");
}
- {
- res1 = SWIG_ConvertPtr(ST(0), &argp1, SWIGTYPE_p_uint32_t, 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "msleep" "', argument " "1"" of type '" "uint32_t""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "msleep" "', argument " "1"" of type '" "uint32_t""'");
- } else {
- arg1 = *(reinterpret_cast< uint32_t * >(argp1));
- }
- }
+ ecode1 = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(0), &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "msleep" "', argument " "1"" of type '" "unsigned int""'");
+ }
+ arg1 = static_cast< unsigned int >(val1);
msleep(arg1);
+
XSRETURN(argvi);
fail:
+
SWIG_croak_null();
}
}
diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp
index 4e1a66d251..7918502b6b 100644
--- a/src/mod/languages/mod_python/mod_python_wrap.cpp
+++ b/src/mod/languages/mod_python/mod_python_wrap.cpp
@@ -8685,25 +8685,17 @@ fail:
SWIGINTERN PyObject *_wrap_msleep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- uint32_t arg1 ;
- void *argp1 ;
- int res1 = 0 ;
+ unsigned int arg1 ;
+ unsigned int val1 ;
+ int ecode1 = 0 ;
PyObject * obj0 = 0 ;
if (!PyArg_ParseTuple(args,(char *)"O:msleep",&obj0)) SWIG_fail;
- {
- res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_uint32_t, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "msleep" "', argument " "1"" of type '" "uint32_t""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "msleep" "', argument " "1"" of type '" "uint32_t""'");
- } else {
- uint32_t * temp = reinterpret_cast< uint32_t * >(argp1);
- arg1 = *temp;
- if (SWIG_IsNewObj(res1)) delete temp;
- }
- }
+ ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "msleep" "', argument " "1"" of type '" "unsigned int""'");
+ }
+ arg1 = static_cast< unsigned int >(val1);
msleep(arg1);
resultobj = SWIG_Py_Void();
return resultobj;
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index 8f113214c4..631f9b0ddf 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -1090,7 +1090,7 @@ SWITCH_DECLARE(void) console_clean_log(char *msg)
}
-SWITCH_DECLARE(void) msleep(uint32_t ms)
+SWITCH_DECLARE(void) msleep(unsigned ms)
{
switch_sleep(ms * 1000);
return;