FreeTDM: Use ftdm_unused_arg() to silence -Wunused-argument warnings

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich committed 2013-05-10 19:04:09 +02:00
1 parent d501c77566
commit ae58a4c1ba
13 files changed
+143 -58

No files matched your search

@@ -435,7 +435,8 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
uint32_t state_counter = 0, elapsed = 0, collecting = 0, interval = 0, last_digit = 0, indicate = 0, dial_timeout = analog_data->wait_dialtone_timeout;
uint32_t answer_on_polarity_counter = 0;
ftdm_sigmsg_t sig;
ftdm_unused_arg(me);
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "ANALOG CHANNEL thread starting.\n");
ts.buffer = NULL;
@@ -1185,7 +1186,8 @@ static void *ftdm_analog_run(ftdm_thread_t *me, void *obj)
ftdm_span_t *span = (ftdm_span_t *) obj;
ftdm_analog_data_t *analog_data = span->signal_data;
int errs = 0;
ftdm_unused_arg(me);
ftdm_log(FTDM_LOG_DEBUG, "ANALOG thread starting.\n");
while(ftdm_running() && ftdm_test_flag(analog_data, FTDM_ANALOG_RUNNING)) {
@@ -91,6 +91,7 @@ static ftdm_status_t ftdm_analog_em_start(ftdm_span_t *span)
static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(analog_em_get_channel_sig_status)
{
ftdm_unused_arg(ftdmchan);
*status = FTDM_SIG_STATE_UP;
return FTDM_SUCCESS;
}
@@ -104,6 +105,7 @@ static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(analog_em_get_channel_sig_status)
static FIO_SPAN_GET_SIG_STATUS_FUNCTION(analog_em_get_span_sig_status)
{
ftdm_unused_arg(span);
*status = FTDM_SIG_STATE_UP;
return FTDM_SUCCESS;
}
@@ -240,7 +242,8 @@ static void *ftdm_analog_em_channel_run(ftdm_thread_t *me, void *obj)
uint32_t cas_answer = 0;
int cas_answer_ms = 500;
ftdm_bool_t digits_sent = FTDM_FALSE;
ftdm_unused_arg(me);
ftdm_log(FTDM_LOG_DEBUG, "ANALOG EM CHANNEL thread starting.\n");
ts.buffer = NULL;
@@ -644,7 +647,7 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
sig.span_id = event->channel->span_id;
sig.channel = event->channel;
ftdm_unused_arg(span);
ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d:%d] STATE [%s]\n",
ftdm_oob_event2str(event->enum_id), event->channel->span_id, event->channel->chan_id, ftdm_channel_state2str(event->channel->state));
@@ -701,6 +704,7 @@ static void *ftdm_analog_em_run(ftdm_thread_t *me, void *obj)
ftdm_span_t *span = (ftdm_span_t *) obj;
ftdm_analog_em_data_t *analog_data = span->signal_data;
ftdm_unused_arg(me);
ftdm_log(FTDM_LOG_DEBUG, "ANALOG EM thread starting.\n");
while(ftdm_running() && ftdm_test_flag(analog_data, FTDM_ANALOG_EM_RUNNING)) {
@@ -102,6 +102,7 @@ static FIO_SPAN_GET_SIG_STATUS_FUNCTION(isdn_get_span_sig_status)
*/
static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(isdn_outgoing_call)
{
ftdm_unused_arg(ftdmchan);
return FTDM_SUCCESS;
}
@@ -116,6 +117,11 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(isdn_outgoing_call)
*/
static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request)
{
ftdm_unused_arg(span);
ftdm_unused_arg(chan_id);
ftdm_unused_arg(direction);
ftdm_unused_arg(caller_data);
ftdm_unused_arg(ftdmchan);
return FTDM_FAIL;
}
@@ -1305,6 +1311,8 @@ static int on_keypad_digit(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pr
ftdm_span_t *span = spri->span;
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->ring.channel);
ftdm_unused_arg(event_type);
if (!chan) {
ftdm_log(FTDM_LOG_ERROR, "-- Keypad event on invalid channel %d:%d\n",
ftdm_span_get_id(span), pevent->ring.channel);
@@ -1335,6 +1343,8 @@ static int on_information(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri
ftdm_caller_data_t *caller_data = NULL;
ftdm_libpri_data_t *isdn_data = span->signal_data;
ftdm_unused_arg(event_type);
if (!chan) {
ftdm_log(FTDM_LOG_CRIT, "-- Info on channel %d:%d but it's not in use?\n", ftdm_span_get_id(span), pevent->ring.channel);
return 0;
@@ -1508,6 +1518,8 @@ static int on_answer(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
ftdm_span_t *span = spri->span;
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->answer.channel);
ftdm_unused_arg(event_type);
if (chan) {
if (!ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
ftdm_log(FTDM_LOG_DEBUG, "-- Call answered, opening B-Channel %d:%d\n",
@@ -1548,6 +1560,8 @@ static int on_proceeding(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_
ftdm_span_t *span = spri->span;
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->proceeding.channel);
ftdm_unused_arg(event_type);
if (chan) {
/* Open channel if inband information is available */
if (pevent->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE || pevent->proceeding.progressmask & PRI_PROG_CALL_NOT_E2E_ISDN) {
@@ -1590,6 +1604,8 @@ static int on_progress(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
ftdm_span_t *span = spri->span;
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->proceeding.channel);
ftdm_unused_arg(event_type);
if (chan) {
/* Open channel if inband information is available */
if (pevent->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE || pevent->proceeding.progressmask & PRI_PROG_CALL_NOT_E2E_ISDN) {
@@ -1634,6 +1650,8 @@ static int on_ringing(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
ftdm_span_t *span = spri->span;
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->ringing.channel);
ftdm_unused_arg(event_type);
if (chan) {
/* we may get on_ringing even when we're already in FTDM_CHANNEL_STATE_PROGRESS_MEDIA */
// if (ftdm_channel_get_state(chan) == FTDM_CHANNEL_STATE_PROGRESS_MEDIA) {
@@ -1790,6 +1808,8 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
ftdm_caller_data_t *caller_data = NULL;
int ret = 0;
ftdm_unused_arg(event_type);
/*
* Check if call has an associated channel (duplicate ring event)
*/
@@ -1947,6 +1967,8 @@ static int on_timeout_t302(struct lpwrap_pri *spri, struct lpwrap_timer *timer)
ftdm_libpri_b_chan_t *chan_priv = ftdm_container_of(timer, ftdm_libpri_b_chan_t, t302);
ftdm_channel_t *chan = chan_priv->channel;
ftdm_unused_arg(spri);
ftdm_log_chan_msg(chan, FTDM_LOG_INFO, "-- T302 timed out, going to state RING\n");
ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_RING);
return 0;
@@ -2019,6 +2041,8 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
{
ftdm_alarm_flag_t alarmbits;
ftdm_unused_arg(span);
ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d][%d:%d] STATE [%s]\n",
ftdm_oob_event2str(event->enum_id),
event->enum_id,
@@ -2113,6 +2137,8 @@ static int on_restart(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
ftdm_span_t *span = spri->span;
int i;
ftdm_unused_arg(event_type);
if (pevent->restart.channel < 1) {
ftdm_log_chan_msg(spri->dchan, FTDM_LOG_NOTICE, "-- Restarting interface\n");
@@ -2156,6 +2182,8 @@ static int on_restart_ack(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri
ftdm_span_t *span = spri->span;
int i;
ftdm_unused_arg(event_type);
if (pevent->restartack.channel < 1) {
ftdm_log_chan_msg(spri->dchan, FTDM_LOG_NOTICE, "-- Restart of interface completed\n");
@@ -2240,12 +2268,14 @@ static float aoc_money_amount(const struct pri_aoc_amount *amount)
static int handle_facility_aoc_s(const struct pri_subcmd_aoc_s *aoc_s)
{
/* Left as an excercise to the reader */
ftdm_unused_arg(aoc_s);
return 0;
}
static int handle_facility_aoc_d(const struct pri_subcmd_aoc_d *aoc_d)
{
/* Left as an excercise to the reader */
ftdm_unused_arg(aoc_d);
return 0;
}
@@ -2376,6 +2406,9 @@ static int on_facility(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
*/
static int on_dchan_up(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
{
ftdm_unused_arg(event_type);
ftdm_unused_arg(pevent);
if (!ftdm_test_flag(spri, LPWRAP_PRI_READY)) {
ftdm_signaling_status_t status = FTDM_SIG_STATE_UP;
ftdm_span_t *span = spri->span;
@@ -2422,6 +2455,9 @@ static int on_dchan_up(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
*/
static int on_dchan_down(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
{
ftdm_unused_arg(event_type);
ftdm_unused_arg(pevent);
if (ftdm_test_flag(spri, LPWRAP_PRI_READY)) {
ftdm_signaling_status_t status = FTDM_SIG_STATE_DOWN;
ftdm_span_t *span = spri->span;
@@ -2491,6 +2527,8 @@ static int on_anything(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
*/
static int on_io_fail(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
{
ftdm_unused_arg(pevent);
ftdm_log(FTDM_LOG_DEBUG, "-- Caught Event span %d %u (%s)\n", ftdm_span_get_id(spri->span), event_type, lpwrap_pri_event_str(event_type));
return 0;
}
@@ -2510,6 +2548,8 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
int res = 0;
int i;
ftdm_unused_arg(me);
ftdm_set_flag(span, FTDM_SPAN_IN_THREAD);
isdn_data->dchan = NULL;
@@ -784,6 +784,8 @@ out:
static int misdn_handle_ph_control_ind(ftdm_channel_t *chan, const struct mISDNhead *hh, const void *data, const int data_len)
{
ftdm_unused_arg(data);
ftdm_log_chan(chan, FTDM_LOG_DEBUG,
"PH_CONTROL_IND:\n"
"\tMessage:\t%s (%#x)\n"
@@ -897,6 +899,8 @@ static int misdn_handle_mph_information_ind(ftdm_channel_t *chan, const struct m
{
struct misdn_chan_private *priv = ftdm_chan_io_private(chan);
ftdm_unused_arg(hh);
/*
* mISDN has some inconsistency issues here.
*
@@ -1795,6 +1799,9 @@ static FIO_CONFIGURE_SPAN_FUNCTION(misdn_configure_span)
char *data = strdup(str);
char *item_list[10];
ftdm_unused_arg(name);
ftdm_unused_arg(number);
/* only these are supported */
switch (ftdm_span_get_trunk_type(span)) {
case FTDM_TRUNK_E1:
@@ -1919,6 +1926,10 @@ error:
*/
static FIO_CONFIGURE_FUNCTION(misdn_configure)
{
ftdm_unused_arg(category);
ftdm_unused_arg(var);
ftdm_unused_arg(val);
ftdm_unused_arg(lineno);
return FTDM_SUCCESS;
}
@@ -1928,6 +1939,7 @@ static FIO_CONFIGURE_FUNCTION(misdn_configure)
*/
static FIO_GET_ALARMS_FUNCTION(misdn_get_alarms)
{
ftdm_unused_arg(ftdmchan);
#if 0
/*
Nope, this won't work...
@@ -2029,6 +2041,8 @@ static FIO_SPAN_POLL_EVENT_FUNCTION(misdn_poll_event)
int retval = 0, nr_events = 0;
int i;
ftdm_unused_arg(poll_events);
for (i = 1; i <= ftdm_span_get_chan_count(span); i++) {
ftdm_channel_t *chan = ftdm_span_get_channel(span, i);
struct misdn_chan_private *chan_priv = ftdm_chan_io_private(chan);
@@ -2445,6 +2459,7 @@ static void *misdn_span_run(ftdm_thread_t *thread, void *data)
int ret;
int i;
ftdm_unused_arg(thread);
ftdm_log(FTDM_LOG_NOTICE, "mISDN[%d:%s] span thread initializing\n",
ftdm_span_get_id(span), ftdm_span_get_name(span));
+32 -1
View File
@@ -37,66 +37,97 @@
static FIO_CONFIGURE_FUNCTION(skel_configure)
{
ftdm_unused_arg(category);
ftdm_unused_arg(var);
ftdm_unused_arg(val);
ftdm_unused_arg(lineno);
return FTDM_FAIL;
}
static FIO_CONFIGURE_SPAN_FUNCTION(skel_configure_span)
{
ftdm_unused_arg(span);
ftdm_unused_arg(str);
ftdm_unused_arg(type);
ftdm_unused_arg(name);
ftdm_unused_arg(number);
return FTDM_FAIL;
}
static FIO_OPEN_FUNCTION(skel_open)
static FIO_OPEN_FUNCTION(skel_open)
{
ftdm_unused_arg(ftdmchan);
return FTDM_FAIL;
}
static FIO_CLOSE_FUNCTION(skel_close)
{
ftdm_unused_arg(ftdmchan);
return FTDM_FAIL;
}
static FIO_WAIT_FUNCTION(skel_wait)
{
ftdm_unused_arg(ftdmchan);
ftdm_unused_arg(flags);
ftdm_unused_arg(to);
return FTDM_FAIL;
}
static FIO_READ_FUNCTION(skel_read)
{
ftdm_unused_arg(ftdmchan);
ftdm_unused_arg(data);
ftdm_unused_arg(datalen);
return FTDM_FAIL;
}
static FIO_WRITE_FUNCTION(skel_write)
{
ftdm_unused_arg(ftdmchan);
ftdm_unused_arg(data);
ftdm_unused_arg(datalen);
return FTDM_FAIL;
}
static FIO_COMMAND_FUNCTION(skel_command)
{
ftdm_unused_arg(ftdmchan);
ftdm_unused_arg(command);
ftdm_unused_arg(obj);
return FTDM_FAIL;
}
static FIO_SPAN_POLL_EVENT_FUNCTION(skel_poll_event)
{
ftdm_unused_arg(span);
ftdm_unused_arg(ms);
ftdm_unused_arg(poll_events);
return FTDM_FAIL;
}
static FIO_SPAN_NEXT_EVENT_FUNCTION(skel_next_event)
{
ftdm_unused_arg(span);
ftdm_unused_arg(event);
return FTDM_FAIL;
}
static FIO_CHANNEL_DESTROY_FUNCTION(skel_channel_destroy)
{
ftdm_unused_arg(ftdmchan);
return FTDM_FAIL;
}
static FIO_SPAN_DESTROY_FUNCTION(skel_span_destroy)
{
ftdm_unused_arg(span);
return FTDM_FAIL;
}
static FIO_GET_ALARMS_FUNCTION(skel_get_alarms)
{
ftdm_unused_arg(ftdmchan);
return FTDM_FAIL;
}
+3 -1
View File
@@ -1034,7 +1034,9 @@ FIO_SPAN_POLL_EVENT_FUNCTION(zt_poll_event)
struct pollfd pfds[FTDM_MAX_CHANNELS_SPAN];
uint32_t i, j = 0, k = 0;
int r;
ftdm_unused_arg(poll_events);
for(i = 1; i <= span->chan_count; i++) {
memset(&pfds[j], 0, sizeof(pfds[j]));
pfds[j].fd = span->channels[i]->sockfd;