Changeset 1013:7b5c46505e09 in freeDiameter

Timestamp:

Mar 29, 2013, 6:11:45 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Replace calls to PyEval_CallFunction by PyObject_CallFunction

Location:

extensions/dbg_interactive

Files:

• dispatch.i (modified) (1 diff)
• messages.i (modified) (1 diff)
• peers.i (modified) (3 diffs)
• routing.i (modified) (2 diffs)
• sessions.i (modified) (1 diff)

extensions/dbg_interactive/dispatch.i

@@ -59 +59 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(cb, "(OOO)", PyMsg, PyAvp, PySess);
+        result = PyObject_CallFunction(cb, "(OOO)", PyMsg, PyAvp, PySess);
         
         /* The result is supposedly composed of: [ ret, *msg, *action ] */

extensions/dbg_interactive/messages.i

@@ -65 +65 @@
                 }
 
-                result = PyEval_CallFunction(l->cb, "(OO)", PyMsg, l->data);
+                result = PyObject_CallFunction(l->cb, "(OO)", PyMsg, l->data);
                 Py_XDECREF(l->cb);
                 Py_XDECREF(l->data);

extensions/dbg_interactive/peers.i

@@ -56 +56 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(PyFunc, "(O)", PyPeer);
+        result = PyObject_CallFunction(PyFunc, "(O)", PyPeer);
         
         Py_XDECREF(result);
@@ -128 +128 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(validate_cb2_py, "(O)", PyInfo);
+        result = PyObject_CallFunction(validate_cb2_py, "(O)", PyInfo);
         
         /* The result is an integer */
@@ -159 +159 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(validate_cb_py, "(O)", PyInfo);
+        result = PyObject_CallFunction(validate_cb_py, "(O)", PyInfo);
         
         /* The result is supposedly -1, 1, or a cb2 */

extensions/dbg_interactive/routing.i

@@ -109 +109 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(cb, "(O)", PyMsg);
+        result = PyObject_CallFunction(cb, "(O)", PyMsg);
         
         /* The result is supposedly composed of: [ ret, *msg ] */
@@ -194 +194 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(cb, "(OO)", PyMsg, PyCands);
+        result = PyObject_CallFunction(cb, "(OO)", PyMsg, PyCands);
         
         /* The result is supposedly composed of: [ ret, *msg ] */

extensions/dbg_interactive/sessions.i

@@ -49 +49 @@
         /* Call the function */
         SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-        result = PyEval_CallFunction((PyObject *)cb, "(Os)", state, sid);
+        result = PyObject_CallFunction((PyObject *)cb, "(Os)", state, sid);
         Py_XDECREF(result);
         SWIG_PYTHON_THREAD_END_BLOCK;