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

freetdm: eliminated some warnings from ftmod_r2 windows build

This commit is contained in:
Arnaldo Pereira 2010-11-25 14:31:30 -02:00
parent 597aa087db
commit 78036cdcec
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
View File

@ -889,7 +889,7 @@ static openr2_io_interface_t ftdm_r2_io_iface = {
static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span) static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
//ftdm_status_t (ftdm_span_t *span, fio_signal_cb_t sig_cb, va_list ap) //ftdm_status_t (ftdm_span_t *span, fio_signal_cb_t sig_cb, va_list ap)
{ {
int i = 0; unsigned int i = 0;
int conf_failure = 0; int conf_failure = 0;
char *var = NULL; char *var = NULL;
char *val = NULL; char *val = NULL;
@ -1107,11 +1107,6 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
openr2_chan_set_log_level(r2chan, r2conf.loglevel); openr2_chan_set_log_level(r2chan, r2conf.loglevel);
if (r2conf.call_files) { if (r2conf.call_files) {
openr2_chan_enable_call_files(r2chan); openr2_chan_enable_call_files(r2chan);
#if 0
if (r2conf.mf_files) {
openr2_chan_enable_mf_files(r2chan);
}
#endif
} }
r2call = ftdm_malloc(sizeof(*r2call)); r2call = ftdm_malloc(sizeof(*r2call));
@ -1348,8 +1343,8 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
ftdm_span_t *span = (ftdm_span_t *) obj; ftdm_span_t *span = (ftdm_span_t *) obj;
ftdm_r2_data_t *r2data = span->signal_data; ftdm_r2_data_t *r2data = span->signal_data;
int waitms = 20; int waitms = 20;
int i, res; unsigned int i;
int ms; int res, ms;
struct timeval start, end; struct timeval start, end;
short *poll_events = ftdm_malloc(sizeof(short)*span->chan_count); short *poll_events = ftdm_malloc(sizeof(short)*span->chan_count);
ftdm_event_t *event = NULL; ftdm_event_t *event = NULL;
@ -1413,8 +1408,8 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
* XXX */ * XXX */
for (i = 1; i <= span->chan_count; i++) { for (i = 1; i <= span->chan_count; i++) {
r2chan = R2CALL(span->channels[i])->r2chan; r2chan = R2CALL(span->channels[i])->r2chan;
r2call = R2CALL(ftdmchan);
ftdmchan = openr2_chan_get_client_data(r2chan); ftdmchan = openr2_chan_get_client_data(r2chan);
r2call = R2CALL(ftdmchan);
ftdm_mutex_lock(ftdmchan->mutex); ftdm_mutex_lock(ftdmchan->mutex);
ftdm_r2_state_advance(ftdmchan); ftdm_r2_state_advance(ftdmchan);
@ -1487,8 +1482,8 @@ static FIO_API_FUNCTION(ftdm_r2_api)
char *mycmd = NULL, *argv[10] = { 0 }; char *mycmd = NULL, *argv[10] = { 0 };
int argc = 0; int argc = 0;
int span_id = 0; int span_id = 0;
int chan_id = 0; unsigned int chan_id = 0;
int i = 0; unsigned int i = 0;
ftdm_r2_data_t *r2data = NULL; ftdm_r2_data_t *r2data = NULL;
openr2_chan_t *r2chan = NULL; openr2_chan_t *r2chan = NULL;
openr2_context_t *r2context = NULL; openr2_context_t *r2context = NULL;