kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod_python3] Fix compiler warnings

This commit is contained in:
morwin1 2022-12-07 04:07:19 +11:00 committed by GitHub
parent d2f84c8342
commit 62d3e52cf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod/languages/mod_python3/freeswitch_python.cpp
View File

@ -167,9 +167,15 @@ void Session::do_hangup_hook()
arglist = Py_BuildValue("(Os)", Self, what); arglist = Py_BuildValue("(Os)", Self, what);
} }
#if PY_VERSION_HEX <= 0x03080000
if (!PyEval_CallObject(hangup_func, arglist)) { if (!PyEval_CallObject(hangup_func, arglist)) {
PyErr_Print(); PyErr_Print();
} }
#else
if (!PyObject_CallObject(hangup_func, arglist)) {
PyErr_Print();
}
#endif
Py_XDECREF(arglist); Py_XDECREF(arglist);
Py_XDECREF(hangup_func_arg); Py_XDECREF(hangup_func_arg);
@ -287,7 +293,7 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp
PyObject *pyresult, *arglist, *io = NULL; PyObject *pyresult, *arglist, *io = NULL;
int ts = 0; int ts = 0;
char *str = NULL, *what = ""; char *str = NULL, *what = (char*)"";
if (TS) { if (TS) {
ts++; ts++;
@ -302,9 +308,9 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp
if (itype == SWITCH_INPUT_TYPE_DTMF) { if (itype == SWITCH_INPUT_TYPE_DTMF) {
switch_dtmf_t *dtmf = (switch_dtmf_t *) input; switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
io = mod_python_conjure_DTMF(dtmf->digit, dtmf->duration); io = mod_python_conjure_DTMF(dtmf->digit, dtmf->duration);
what = "dtmf"; what = (char*)"dtmf";
} else if (itype == SWITCH_INPUT_TYPE_EVENT){ } else if (itype == SWITCH_INPUT_TYPE_EVENT){
what = "event"; what = (char*)"event";
io = mod_python_conjure_event((switch_event_t *) input); io = mod_python_conjure_event((switch_event_t *) input);
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unsupported type!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unsupported type!\n");
@ -320,8 +326,12 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp
} else { } else {
arglist = Py_BuildValue("(OsO)", Self, what, io); arglist = Py_BuildValue("(OsO)", Self, what, io);
} }
#if PY_VERSION_HEX <= 0x03080000
if ((pyresult = PyEval_CallObject(cb_function, arglist))) { pyresult = PyEval_CallObject(cb_function, arglist);
#else
pyresult = PyObject_CallObject(cb_function, arglist);
#endif
if (pyresult) {
str = (char *) PyString_AsString(pyresult); str = (char *) PyString_AsString(pyresult);
} else { } else {
PyErr_Print(); PyErr_Print();