Mercurial > hg > freeDiameter
changeset 1013:7b5c46505e09
Replace calls to PyEval_CallFunction by PyObject_CallFunction
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Fri, 29 Mar 2013 17:11:45 +0800 |
| parents | cafdcbcb5e79 |
| children | 908ffbb81f60 |
| files | extensions/dbg_interactive/dispatch.i extensions/dbg_interactive/messages.i extensions/dbg_interactive/peers.i extensions/dbg_interactive/routing.i extensions/dbg_interactive/sessions.i |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/dbg_interactive/dispatch.i Thu Mar 28 11:20:50 2013 +0800 +++ b/extensions/dbg_interactive/dispatch.i Fri Mar 29 17:11:45 2013 +0800 @@ -58,7 +58,7 @@ PySess = SWIG_NewPointerObj((void *) session, SWIGTYPE_p_session, 0 ); /* 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 ] */ if ((result == NULL) || (!PyList_Check(result)) || (PyList_Size(result) != 3)) {
--- a/extensions/dbg_interactive/messages.i Thu Mar 28 11:20:50 2013 +0800 +++ b/extensions/dbg_interactive/messages.i Fri Mar 29 17:11:45 2013 +0800 @@ -64,7 +64,7 @@ PyMsg = SWIG_NewPointerObj((void *)*msg, SWIGTYPE_p_msg, 0 ); } - 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); free(l);
--- a/extensions/dbg_interactive/peers.i Thu Mar 28 11:20:50 2013 +0800 +++ b/extensions/dbg_interactive/peers.i Fri Mar 29 17:11:45 2013 +0800 @@ -55,7 +55,7 @@ PyPeer = SWIG_NewPointerObj((void *)peer, SWIGTYPE_p_peer_info, 0 ); /* Call the function */ - result = PyEval_CallFunction(PyFunc, "(O)", PyPeer); + result = PyObject_CallFunction(PyFunc, "(O)", PyPeer); Py_XDECREF(result); Py_XDECREF(PyFunc); @@ -127,7 +127,7 @@ PyInfo = SWIG_NewPointerObj((void *)info, SWIGTYPE_p_peer_info, 0 ); /* Call the function */ - result = PyEval_CallFunction(validate_cb2_py, "(O)", PyInfo); + result = PyObject_CallFunction(validate_cb2_py, "(O)", PyInfo); /* The result is an integer */ if ((result == NULL) || !SWIG_IsOK(SWIG_AsVal_int(result, &ret))) { @@ -158,7 +158,7 @@ PyInfo = SWIG_NewPointerObj((void *)info, SWIGTYPE_p_peer_info, 0 ); /* 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 */ if (result == NULL) {
--- a/extensions/dbg_interactive/routing.i Thu Mar 28 11:20:50 2013 +0800 +++ b/extensions/dbg_interactive/routing.i Fri Mar 29 17:11:45 2013 +0800 @@ -108,7 +108,7 @@ PyMsg = SWIG_NewPointerObj((void *)*msg, SWIGTYPE_p_msg, 0 ); /* Call the function */ - result = PyEval_CallFunction(cb, "(O)", PyMsg); + result = PyObject_CallFunction(cb, "(O)", PyMsg); /* The result is supposedly composed of: [ ret, *msg ] */ if ((result == NULL) || (!PyList_Check(result)) || (PyList_Size(result) != 2)) { @@ -193,7 +193,7 @@ PyCands = SWIG_NewPointerObj((void *)candidates, SWIGTYPE_p_fd_list, 0 ); /* 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 ] */ if (result == NULL){
--- a/extensions/dbg_interactive/sessions.i Thu Mar 28 11:20:50 2013 +0800 +++ b/extensions/dbg_interactive/sessions.i Fri Mar 29 17:11:45 2013 +0800 @@ -48,7 +48,7 @@ /* 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; return;