提交 38304841 authored 作者: Moises Silva's avatar Moises Silva

freetdm: do not expect result_cb to be set to make the interface cleaner

上级 946ec628
...@@ -37,9 +37,6 @@ ...@@ -37,9 +37,6 @@
* *
*/ */
#ifdef MOYTEST
crap
#endif
#define _GNU_SOURCE #define _GNU_SOURCE
#include "private/ftdm_core.h" #include "private/ftdm_core.h"
#include <stdarg.h> #include <stdarg.h>
...@@ -2509,10 +2506,12 @@ FT_DECLARE(ftdm_status_t) _ftdm_call_place(const char *file, const char *func, i ...@@ -2509,10 +2506,12 @@ FT_DECLARE(ftdm_status_t) _ftdm_call_place(const char *file, const char *func, i
} }
/* we have a locked channel and are not afraid of using it! */ /* we have a locked channel and are not afraid of using it! */
status = hunting->result_cb(fchan, caller_data); if (hunting->result_cb) {
if (status != FTDM_SUCCESS) { status = hunting->result_cb(fchan, caller_data);
status = FTDM_ECANCELED; if (status != FTDM_SUCCESS) {
goto done; status = FTDM_ECANCELED;
goto done;
}
} }
ftdm_channel_set_caller_data(fchan, caller_data); ftdm_channel_set_caller_data(fchan, caller_data);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论