freetdm: removed empty stats from ftmod_r2 and fixed strsep() definition warning.

This commit is contained in:
Arnaldo Pereira 2010-11-17 14:36:31 -02:00
parent 525f399812
commit fee2f1b701
1 changed files with 8 additions and 13 deletions

View File

@ -31,11 +31,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdio.h>
#ifdef __linux__ #ifdef __linux__
#ifndef _BSD_SOURCE
#define _BSD_SOURCE /* for strsep() */
#endif
#include <syscall.h> #include <syscall.h>
#include <poll.h> #include <poll.h>
#include <string.h>
#endif #endif
#include <stdio.h>
#include <openr2.h> #include <openr2.h>
#include "freetdm.h" #include "freetdm.h"
#include "private/ftdm_core.h" #include "private/ftdm_core.h"
@ -1607,22 +1611,13 @@ static FIO_API_FUNCTION(ftdm_r2_api)
r2data->loops, r2data->loops,
r2data->monitor_thread_id); r2data->monitor_thread_id);
stream->write_function(stream, "\n"); stream->write_function(stream, "\n");
stream->write_function(stream, "%4s %-12.12s %-12.12s %6s %6s %6s %6s\n", "Channel", "Tx CAS", "Rx CAS", stream->write_function(stream, "%4s %-12.12s %-12.12s\n", "Channel", "Tx CAS", "Rx CAS");
"Rx Avg", "Tx Avg", "Rx", "Tx");
for (i = 1; i <= span->chan_count; i++) { for (i = 1; i <= span->chan_count; i++) {
char rx_str[25];
char tx_str[25];
char rxavg_str[25];
char txavg_str[25];
r2chan = R2CALL(span->channels[i])->r2chan; r2chan = R2CALL(span->channels[i])->r2chan;
stream->write_function(stream, "%4d %-12.12s %-12.12s %6s %6s %6s %6s\n", stream->write_function(stream, "%4d %-12.12s %-12.12s\n",
span->channels[i]->chan_id, span->channels[i]->chan_id,
openr2_chan_get_tx_cas_string(r2chan), openr2_chan_get_tx_cas_string(r2chan),
openr2_chan_get_rx_cas_string(r2chan), openr2_chan_get_rx_cas_string(r2chan));
rxavg_str,
txavg_str,
rx_str,
tx_str);
} }
stream->write_function(stream, "\n"); stream->write_function(stream, "\n");
stream->write_function(stream, "+OK.\n"); stream->write_function(stream, "+OK.\n");