[Freeswitch-svn] [commit] r12209 - in freeswitch/trunk/libs/esl: lua perl php python ruby src src/include

FreeSWITCH SVN anthm at freeswitch.org
Fri Feb 20 15:03:06 PST 2009


Author: anthm
Date: Fri Feb 20 17:03:06 2009
New Revision: 12209

Log:
trick swig

Modified:
   freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
   freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
   freeswitch/trunk/libs/esl/php/esl_wrap.cpp
   freeswitch/trunk/libs/esl/python/esl_wrap.cpp
   freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
   freeswitch/trunk/libs/esl/src/esl_oop.cpp
   freeswitch/trunk/libs/esl/src/include/esl_oop.h

Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	Fri Feb 20 17:03:06 2009
@@ -1488,9 +1488,8 @@
 #define SWIGTYPE_p_ESLevent swig_types[1]
 #define SWIGTYPE_p_esl_event_t swig_types[2]
 #define SWIGTYPE_p_esl_priority_t swig_types[3]
-#define SWIGTYPE_p_esl_status_t swig_types[4]
-static swig_type_info *swig_types[6];
-static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
+static swig_type_info *swig_types[5];
+static swig_module_info swig_module = {swig_types, 4, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2278,7 +2277,7 @@
   int SWIG_arg = -1;
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   
   SWIG_check_num_args("send",2,2)
   if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("send",1,"ESLconnection *");
@@ -2289,12 +2288,9 @@
   }
   
   arg2 = (char *)lua_tostring(L, 2);
-  result = (arg1)->send((char const *)arg2);
+  result = (int)(arg1)->send((char const *)arg2);
   SWIG_arg=0;
-  {
-    esl_status_t * resultptr = new esl_status_t((esl_status_t &) result);
-    SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++;
-  }
+  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2403,7 +2399,7 @@
   int SWIG_arg = -1;
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   ESLevent *arg2 = (ESLevent *) 0 ;
-  esl_status_t result;
+  int result;
   
   SWIG_check_num_args("sendEvent",2,2)
   if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("sendEvent",1,"ESLconnection *");
@@ -2418,12 +2414,9 @@
     SWIG_fail_ptr("ESLconnection_sendEvent",2,SWIGTYPE_p_ESLevent);
   }
   
-  result = (arg1)->sendEvent(arg2);
+  result = (int)(arg1)->sendEvent(arg2);
   SWIG_arg=0;
-  {
-    esl_status_t * resultptr = new esl_status_t((esl_status_t &) result);
-    SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++;
-  }
+  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2492,7 +2485,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   
   SWIG_check_num_args("filter",3,3)
   if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("filter",1,"ESLconnection *");
@@ -2505,12 +2498,9 @@
   
   arg2 = (char *)lua_tostring(L, 2);
   arg3 = (char *)lua_tostring(L, 3);
-  result = (arg1)->filter((char const *)arg2,(char const *)arg3);
+  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
   SWIG_arg=0;
-  {
-    esl_status_t * resultptr = new esl_status_t((esl_status_t &) result);
-    SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++;
-  }
+  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2526,7 +2516,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   
   SWIG_check_num_args("events",3,3)
   if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("events",1,"ESLconnection *");
@@ -2539,12 +2529,9 @@
   
   arg2 = (char *)lua_tostring(L, 2);
   arg3 = (char *)lua_tostring(L, 3);
-  result = (arg1)->events((char const *)arg2,(char const *)arg3);
+  result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
   SWIG_arg=0;
-  {
-    esl_status_t * resultptr = new esl_status_t((esl_status_t &) result);
-    SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++;
-  }
+  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2561,7 +2548,7 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) NULL ;
   char *arg4 = (char *) NULL ;
-  esl_status_t result;
+  int result;
   
   SWIG_check_num_args("execute",2,4)
   if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("execute",1,"ESLconnection *");
@@ -2580,12 +2567,9 @@
   if(lua_gettop(L)>=4){
     arg4 = (char *)lua_tostring(L, 4);
   }
-  result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+  result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
   SWIG_arg=0;
-  {
-    esl_status_t * resultptr = new esl_status_t((esl_status_t &) result);
-    SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++;
-  }
+  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
   return SWIG_arg;
   
   if(0) SWIG_fail;
@@ -2723,28 +2707,24 @@
 static swig_type_info _swigt__p_ESLevent = {"_p_ESLevent", "ESLevent *", 0, 0, (void*)&_wrap_class_ESLevent, 0};
 static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ESLconnection,
   &_swigt__p_ESLevent,
   &_swigt__p_esl_event_t,
   &_swigt__p_esl_priority_t,
-  &_swigt__p_esl_status_t,
 };
 
 static swig_cast_info _swigc__p_ESLconnection[] = {  {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ESLevent[] = {  {&_swigt__p_ESLevent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_event_t[] = {  {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_priority_t[] = {  {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_esl_status_t[] = {  {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ESLconnection,
   _swigc__p_ESLevent,
   _swigc__p_esl_event_t,
   _swigc__p_esl_priority_t,
-  _swigc__p_esl_status_t,
 };
 
 

Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	Fri Feb 20 17:03:06 2009
@@ -1451,9 +1451,8 @@
 #define SWIGTYPE_p_char swig_types[2]
 #define SWIGTYPE_p_esl_event_t swig_types[3]
 #define SWIGTYPE_p_esl_priority_t swig_types[4]
-#define SWIGTYPE_p_esl_status_t swig_types[5]
-static swig_type_info *swig_types[7];
-static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
+static swig_type_info *swig_types[6];
+static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2750,7 +2749,7 @@
   {
     ESLconnection *arg1 = (ESLconnection *) 0 ;
     char *arg2 = (char *) 0 ;
-    esl_status_t result;
+    int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res2 ;
@@ -2772,8 +2771,8 @@
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_send" "', argument " "2"" of type '" "char const *""'");
     }
     arg2 = reinterpret_cast< char * >(buf2);
-    result = (arg1)->send((char const *)arg2);
-    ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ;
+    result = (int)(arg1)->send((char const *)arg2);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     XSRETURN(argvi);
@@ -2932,7 +2931,7 @@
   {
     ESLconnection *arg1 = (ESLconnection *) 0 ;
     ESLevent *arg2 = (ESLevent *) 0 ;
-    esl_status_t result;
+    int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     void *argp2 = 0 ;
@@ -2953,8 +2952,8 @@
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendEvent" "', argument " "2"" of type '" "ESLevent *""'"); 
     }
     arg2 = reinterpret_cast< ESLevent * >(argp2);
-    result = (arg1)->sendEvent(arg2);
-    ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ;
+    result = (int)(arg1)->sendEvent(arg2);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
     
     XSRETURN(argvi);
@@ -3037,7 +3036,7 @@
     ESLconnection *arg1 = (ESLconnection *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
-    esl_status_t result;
+    int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res2 ;
@@ -3067,8 +3066,8 @@
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'");
     }
     arg3 = reinterpret_cast< char * >(buf3);
-    result = (arg1)->filter((char const *)arg2,(char const *)arg3);
-    ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ;
+    result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
@@ -3087,7 +3086,7 @@
     ESLconnection *arg1 = (ESLconnection *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
-    esl_status_t result;
+    int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res2 ;
@@ -3117,8 +3116,8 @@
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_events" "', argument " "3"" of type '" "char const *""'");
     }
     arg3 = reinterpret_cast< char * >(buf3);
-    result = (arg1)->events((char const *)arg2,(char const *)arg3);
-    ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ;
+    result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
@@ -3138,7 +3137,7 @@
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) NULL ;
     char *arg4 = (char *) NULL ;
-    esl_status_t result;
+    int result;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res2 ;
@@ -3180,8 +3179,8 @@
       }
       arg4 = reinterpret_cast< char * >(buf4);
     }
-    result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
-    ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ;
+    result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
     if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
@@ -3310,7 +3309,6 @@
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ESLconnection,
@@ -3318,7 +3316,6 @@
   &_swigt__p_char,
   &_swigt__p_esl_event_t,
   &_swigt__p_esl_priority_t,
-  &_swigt__p_esl_status_t,
 };
 
 static swig_cast_info _swigc__p_ESLconnection[] = {  {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}};
@@ -3326,7 +3323,6 @@
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_event_t[] = {  {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_priority_t[] = {  {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_esl_status_t[] = {  {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ESLconnection,
@@ -3334,7 +3330,6 @@
   _swigc__p_char,
   _swigc__p_esl_event_t,
   _swigc__p_esl_priority_t,
-  _swigc__p_esl_status_t,
 };
 
 

Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp	Fri Feb 20 17:03:06 2009
@@ -932,9 +932,8 @@
 #define SWIGTYPE_p_ESLevent swig_types[1]
 #define SWIGTYPE_p_esl_event_t swig_types[2]
 #define SWIGTYPE_p_esl_priority_t swig_types[3]
-#define SWIGTYPE_p_esl_status_t swig_types[4]
-static swig_type_info *swig_types[6];
-static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
+static swig_type_info *swig_types[5];
+static swig_module_info swig_module = {swig_types, 4, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -988,28 +987,24 @@
 static swig_type_info _swigt__p_ESLevent = {"_p_ESLevent", "ESLevent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ESLconnection,
   &_swigt__p_ESLevent,
   &_swigt__p_esl_event_t,
   &_swigt__p_esl_priority_t,
-  &_swigt__p_esl_status_t,
 };
 
 static swig_cast_info _swigc__p_ESLconnection[] = {  {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ESLevent[] = {  {&_swigt__p_ESLevent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_event_t[] = {  {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_priority_t[] = {  {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_esl_status_t[] = {  {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ESLconnection,
   _swigc__p_ESLevent,
   _swigc__p_esl_event_t,
   _swigc__p_esl_priority_t,
-  _swigc__p_esl_status_t,
 };
 
 
@@ -1018,7 +1013,6 @@
 /* end header section */
 /* vdecl subsection */
 static int le_swig__p_esl_priority_t=0; /* handle for _p_esl_priority_t */
-static int le_swig__p_esl_status_t=0; /* handle for _p_esl_status_t */
 static int le_swig__p_ESLevent=0; /* handle for ESLevent */
 static int le_swig__p_esl_event_t=0; /* handle for _p_esl_event_t */
 static int le_swig__p_ESLconnection=0; /* handle for ESLconnection */
@@ -1822,7 +1816,7 @@
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_send) {
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   zval **args[2];
   
   SWIG_ResetError();
@@ -1842,10 +1836,9 @@
   arg2 = (char *) Z_STRVAL_PP(args[1]);
   /*@SWIG@*/;
   
-  result = (arg1)->send((char const *)arg2);
+  result = (int)(arg1)->send((char const *)arg2);
   {
-    esl_status_t * resultobj = new esl_status_t((esl_status_t &) result);
-    SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1);
+    ZVAL_LONG(return_value,result);
   }
   return;
 fail:
@@ -1975,7 +1968,7 @@
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_sendEvent) {
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   ESLevent *arg2 = (ESLevent *) 0 ;
-  esl_status_t result;
+  int result;
   zval **args[2];
   
   SWIG_ResetError();
@@ -1994,10 +1987,9 @@
       SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of ESLconnection_sendEvent. Expected SWIGTYPE_p_ESLevent");
     }
   }
-  result = (arg1)->sendEvent(arg2);
+  result = (int)(arg1)->sendEvent(arg2);
   {
-    esl_status_t * resultobj = new esl_status_t((esl_status_t &) result);
-    SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1);
+    ZVAL_LONG(return_value,result);
   }
   return;
 fail:
@@ -2068,7 +2060,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   zval **args[3];
   
   SWIG_ResetError();
@@ -2094,10 +2086,9 @@
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
   
-  result = (arg1)->filter((char const *)arg2,(char const *)arg3);
+  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
   {
-    esl_status_t * resultobj = new esl_status_t((esl_status_t &) result);
-    SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1);
+    ZVAL_LONG(return_value,result);
   }
   return;
 fail:
@@ -2109,7 +2100,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   zval **args[3];
   
   SWIG_ResetError();
@@ -2135,10 +2126,9 @@
   arg3 = (char *) Z_STRVAL_PP(args[2]);
   /*@SWIG@*/;
   
-  result = (arg1)->events((char const *)arg2,(char const *)arg3);
+  result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
   {
-    esl_status_t * resultobj = new esl_status_t((esl_status_t &) result);
-    SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1);
+    ZVAL_LONG(return_value,result);
   }
   return;
 fail:
@@ -2151,7 +2141,7 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) NULL ;
   char *arg4 = (char *) NULL ;
-  esl_status_t result;
+  int result;
   zval **args[4];
   int arg_count;
   
@@ -2187,10 +2177,9 @@
     /*@SWIG@*/;
     
   }
-  result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+  result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
   {
-    esl_status_t * resultobj = new esl_status_t((esl_status_t &) result);
-    SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1);
+    ZVAL_LONG(return_value,result);
   }
   return;
 fail:
@@ -2292,10 +2281,6 @@
   /* No destructor for simple type _p_esl_priority_t */
 }
 /* NEW Destructor style */
-static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_esl_status_t) {
-  /* No destructor for simple type _p_esl_status_t */
-}
-/* NEW Destructor style */
 static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_ESLevent) {
   __wrap_delete_ESLevent(rsrc, SWIGTYPE_p_ESLevent->name TSRMLS_CC);
 }
@@ -2623,8 +2608,6 @@
 /* Register resource destructors for pointer types */
 le_swig__p_esl_priority_t=zend_register_list_destructors_ex(_wrap_destroy_p_esl_priority_t,NULL,(char *)(SWIGTYPE_p_esl_priority_t->name),module_number);
 SWIG_TypeClientData(SWIGTYPE_p_esl_priority_t,&le_swig__p_esl_priority_t);
-le_swig__p_esl_status_t=zend_register_list_destructors_ex(_wrap_destroy_p_esl_status_t,NULL,(char *)(SWIGTYPE_p_esl_status_t->name),module_number);
-SWIG_TypeClientData(SWIGTYPE_p_esl_status_t,&le_swig__p_esl_status_t);
 le_swig__p_ESLevent=zend_register_list_destructors_ex(_wrap_destroy_p_ESLevent,NULL,(char *)(SWIGTYPE_p_ESLevent->name),module_number);
 SWIG_TypeClientData(SWIGTYPE_p_ESLevent,&le_swig__p_ESLevent);
 le_swig__p_esl_event_t=zend_register_list_destructors_ex(_wrap_destroy_p_esl_event_t,NULL,(char *)(SWIGTYPE_p_esl_event_t->name),module_number);

Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp	Fri Feb 20 17:03:06 2009
@@ -2501,9 +2501,8 @@
 #define SWIGTYPE_p_char swig_types[2]
 #define SWIGTYPE_p_esl_event_t swig_types[3]
 #define SWIGTYPE_p_esl_priority_t swig_types[4]
-#define SWIGTYPE_p_esl_status_t swig_types[5]
-static swig_type_info *swig_types[7];
-static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
+static swig_type_info *swig_types[6];
+static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3664,7 +3663,7 @@
   PyObject *resultobj = 0;
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3684,8 +3683,8 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_send" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  result = (arg1)->send((char const *)arg2);
-  resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->send((char const *)arg2);
+  resultobj = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -3828,7 +3827,7 @@
   PyObject *resultobj = 0;
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   ESLevent *arg2 = (ESLevent *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3847,8 +3846,8 @@
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendEvent" "', argument " "2"" of type '" "ESLevent *""'"); 
   }
   arg2 = reinterpret_cast< ESLevent * >(argp2);
-  result = (arg1)->sendEvent(arg2);
-  resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->sendEvent(arg2);
+  resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
 fail:
   return NULL;
@@ -3913,7 +3912,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3942,8 +3941,8 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'");
   }
   arg3 = reinterpret_cast< char * >(buf3);
-  result = (arg1)->filter((char const *)arg2,(char const *)arg3);
-  resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
+  resultobj = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   return resultobj;
@@ -3959,7 +3958,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3988,8 +3987,8 @@
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_events" "', argument " "3"" of type '" "char const *""'");
   }
   arg3 = reinterpret_cast< char * >(buf3);
-  result = (arg1)->events((char const *)arg2,(char const *)arg3);
-  resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
+  resultobj = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   return resultobj;
@@ -4006,7 +4005,7 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) NULL ;
   char *arg4 = (char *) NULL ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -4048,8 +4047,8 @@
     }
     arg4 = reinterpret_cast< char * >(buf4);
   }
-  result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
-  resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+  resultobj = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
@@ -4205,7 +4204,6 @@
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ESLconnection,
@@ -4213,7 +4211,6 @@
   &_swigt__p_char,
   &_swigt__p_esl_event_t,
   &_swigt__p_esl_priority_t,
-  &_swigt__p_esl_status_t,
 };
 
 static swig_cast_info _swigc__p_ESLconnection[] = {  {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}};
@@ -4221,7 +4218,6 @@
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_event_t[] = {  {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_priority_t[] = {  {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_esl_status_t[] = {  {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ESLconnection,
@@ -4229,7 +4225,6 @@
   _swigc__p_char,
   _swigc__p_esl_event_t,
   _swigc__p_esl_priority_t,
-  _swigc__p_esl_status_t,
 };
 
 

Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	Fri Feb 20 17:03:06 2009
@@ -1776,9 +1776,8 @@
 #define SWIGTYPE_p_char swig_types[2]
 #define SWIGTYPE_p_esl_event_t swig_types[3]
 #define SWIGTYPE_p_esl_priority_t swig_types[4]
-#define SWIGTYPE_p_esl_status_t swig_types[5]
-static swig_type_info *swig_types[7];
-static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
+static swig_type_info *swig_types[6];
+static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2785,7 +2784,7 @@
 _wrap_ESLconnection_send(int argc, VALUE *argv, VALUE self) {
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -2806,8 +2805,8 @@
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","send", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  result = (arg1)->send((char const *)arg2);
-  vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->send((char const *)arg2);
+  vresult = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return vresult;
 fail:
@@ -2951,7 +2950,7 @@
 _wrap_ESLconnection_sendEvent(int argc, VALUE *argv, VALUE self) {
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   ESLevent *arg2 = (ESLevent *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2971,8 +2970,8 @@
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "ESLevent *","sendEvent", 2, argv[0] )); 
   }
   arg2 = reinterpret_cast< ESLevent * >(argp2);
-  result = (arg1)->sendEvent(arg2);
-  vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->sendEvent(arg2);
+  vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -3040,7 +3039,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3069,8 +3068,8 @@
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","filter", 3, argv[1] ));
   }
   arg3 = reinterpret_cast< char * >(buf3);
-  result = (arg1)->filter((char const *)arg2,(char const *)arg3);
-  vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3);
+  vresult = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   return vresult;
@@ -3086,7 +3085,7 @@
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3115,8 +3114,8 @@
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","events", 3, argv[1] ));
   }
   arg3 = reinterpret_cast< char * >(buf3);
-  result = (arg1)->events((char const *)arg2,(char const *)arg3);
-  vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
+  vresult = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   return vresult;
@@ -3133,7 +3132,7 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) NULL ;
   char *arg4 = (char *) NULL ;
-  esl_status_t result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3174,8 +3173,8 @@
     }
     arg4 = reinterpret_cast< char * >(buf4);
   }
-  result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
-  vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN |  0 );
+  result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+  vresult = SWIG_From_int(static_cast< int >(result));
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
   if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
@@ -3287,7 +3286,6 @@
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ESLconnection,
@@ -3295,7 +3293,6 @@
   &_swigt__p_char,
   &_swigt__p_esl_event_t,
   &_swigt__p_esl_priority_t,
-  &_swigt__p_esl_status_t,
 };
 
 static swig_cast_info _swigc__p_ESLconnection[] = {  {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}};
@@ -3303,7 +3300,6 @@
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_event_t[] = {  {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_esl_priority_t[] = {  {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_esl_status_t[] = {  {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ESLconnection,
@@ -3311,7 +3307,6 @@
   _swigc__p_char,
   _swigc__p_esl_event_t,
   _swigc__p_esl_priority_t,
-  _swigc__p_esl_status_t,
 };
 
 

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Fri Feb 20 17:03:06 2009
@@ -38,7 +38,7 @@
 	return handle.connected;
 }
 
-esl_status_t ESLconnection::send(const char *cmd)
+int ESLconnection::send(const char *cmd)
 {
 	return esl_send(&handle, cmd);
 }
@@ -137,12 +137,12 @@
 	return handle.event_lock;
 }
 
-esl_status_t ESLconnection::execute(const char *app, const char *arg, const char *uuid)
+int ESLconnection::execute(const char *app, const char *arg, const char *uuid)
 {
 	return esl_execute(&handle, app, arg, uuid);
 }
 
-esl_status_t ESLconnection::sendEvent(ESLevent *send_me)
+int ESLconnection::sendEvent(ESLevent *send_me)
 {
 	return esl_sendevent(&handle, send_me->event);
 }
@@ -186,12 +186,12 @@
 	return NULL;
 }
 
-esl_status_t ESLconnection::filter(const char *header, const char *value)
+int ESLconnection::filter(const char *header, const char *value)
 {
 	return esl_filter(&handle, header, value);
 }
 
-esl_status_t ESLconnection::events(const char *etype, const char *value)
+int ESLconnection::events(const char *etype, const char *value)
 {
 	esl_event_type_t type_id = ESL_EVENT_TYPE_PLAIN;
 

Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h
==============================================================================
--- freeswitch/trunk/libs/esl/src/include/esl_oop.h	(original)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h	Fri Feb 20 17:03:06 2009
@@ -75,16 +75,16 @@
 	virtual ~ESLconnection();
 	int connected();
 	ESLevent *getInfo();
-	esl_status_t send(const char *cmd);
+	int send(const char *cmd);
 	ESLevent *sendRecv(const char *cmd);
 	ESLevent *api(const char *cmd, const char *arg = NULL);
 	ESLevent *bgapi(const char *cmd, const char *arg = NULL);
-	esl_status_t sendEvent(ESLevent *send_me);
+	int sendEvent(ESLevent *send_me);
 	ESLevent *recvEvent();
 	ESLevent *recvEventTimed(int ms);
-	esl_status_t filter(const char *header, const char *value);
-	esl_status_t events(const char *etype, const char *value);
-	esl_status_t execute(const char *app, const char *arg = NULL, const char *uuid = NULL);
+	int filter(const char *header, const char *value);
+	int events(const char *etype, const char *value);
+	int execute(const char *app, const char *arg = NULL, const char *uuid = NULL);
 	int setBlockingExecute(const char *val);
 	int setEventLock(const char *val);
 };



More information about the Freeswitch-svn mailing list