[Freeswitch-svn] [commit] r10502 - in freeswitch/trunk/src: . include mod/languages/mod_java mod/languages/mod_java/src/org/freeswitch/swig mod/languages/mod_lua mod/languages/mod_managed mod/languages/mod_perl mod/languages/mod_python

FreeSWITCH SVN brian at freeswitch.org
Fri Nov 21 11:15:48 PST 2008


Author: brian
Date: Fri Nov 21 14:15:47 2008
New Revision: 10502

Log:
change types

Modified:
   freeswitch/trunk/src/include/switch_cpp.h
   freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
   freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp
   freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp
   freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
   freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp
   freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp
   freeswitch/trunk/src/switch_cpp.cpp

Modified: freeswitch/trunk/src/include/switch_cpp.h
==============================================================================
--- freeswitch/trunk/src/include/switch_cpp.h	(original)
+++ freeswitch/trunk/src/include/switch_cpp.h	Fri Nov 21 14:15:47 2008
@@ -373,7 +373,7 @@
 
 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
  * 

Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java	(original)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java	Fri Nov 21 14:15:47 2008
@@ -25,8 +25,8 @@
     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) {

Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp	(original)
+++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp	Fri Nov 21 14:15:47 2008
@@ -3033,17 +3033,11 @@
 
 
 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);
 }
 

Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp	(original)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp	Fri Nov 21 14:15:47 2008
@@ -6793,17 +6793,11 @@
 
 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;
   

Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx	(original)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx	Fri Nov 21 14:15:47 2008
@@ -26839,10 +26839,10 @@
 }
 
 
-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);
 }
 

Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp	(original)
+++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp	Fri Nov 21 14:15:47 2008
@@ -8970,30 +8970,26 @@
 
 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();
   }
 }

Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp	(original)
+++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp	Fri Nov 21 14:15:47 2008
@@ -8685,25 +8685,17 @@
 
 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;

Modified: freeswitch/trunk/src/switch_cpp.cpp
==============================================================================
--- freeswitch/trunk/src/switch_cpp.cpp	(original)
+++ freeswitch/trunk/src/switch_cpp.cpp	Fri Nov 21 14:15:47 2008
@@ -1090,7 +1090,7 @@
 }
 
 
-SWITCH_DECLARE(void) msleep(uint32_t ms)
+SWITCH_DECLARE(void) msleep(unsigned ms)
 {
 	switch_sleep(ms * 1000);
 	return;



More information about the Freeswitch-svn mailing list