From c5cfc2a867dbc393d7b8bc2f7af564372412e621 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 5 Jan 2010 18:57:29 +0000 Subject: [PATCH] Removed unused parameters from analog_available() and sig_pri_available(). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@237804 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 4 ++-- channels/sig_analog.c | 2 +- channels/sig_analog.h | 2 +- channels/sig_pri.c | 2 +- channels/sig_pri.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index a6829f1..2e15b84 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -11817,12 +11817,12 @@ static inline int available(struct dahdi_pvt *p, int channelmatch, ast_group_t g return 0; if (analog_lib_handles(p->sig, p->radio, p->oprmode)) - return analog_available(p->sig_pvt, channelmatch, groupmatch, reason, channelmatched, groupmatched); + return analog_available(p->sig_pvt, reason); #ifdef HAVE_PRI switch (p->sig) { case SIG_PRI_LIB_HANDLE_CASES: - return sig_pri_available(p->sig_pvt, channelmatch, groupmatch, reason, channelmatched, groupmatched); + return sig_pri_available(p->sig_pvt, reason); default: break; } diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 1fe2d53..cf9d066 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -649,7 +649,7 @@ struct ast_channel * analog_request(struct analog_pvt *p, int *callwait, const s return analog_new_ast_channel(p, AST_STATE_RESERVED, 0, p->owner ? ANALOG_SUB_CALLWAIT : ANALOG_SUB_REAL, requestor); } -int analog_available(struct analog_pvt *p, int channelmatch, ast_group_t groupmatch, int *busy, int *channelmatched, int *groupmatched) +int analog_available(struct analog_pvt *p, int *busy) { int offhook; diff --git a/channels/sig_analog.h b/channels/sig_analog.h index 5993e9f..76972fe 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -336,7 +336,7 @@ struct ast_frame *analog_exception(struct analog_pvt *p, struct ast_channel *ast struct ast_channel * analog_request(struct analog_pvt *p, int *callwait, const struct ast_channel *requestor); -int analog_available(struct analog_pvt *p, int channelmatch, ast_group_t groupmatch, int *busy, int *channelmatched, int *groupmatched); +int analog_available(struct analog_pvt *p, int *busy); void *analog_handle_init_event(struct analog_pvt *i, int event); diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 02ff0a1..284b810 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -3862,7 +3862,7 @@ int sig_pri_answer(struct sig_pri_chan *p, struct ast_channel *ast) return res; } -int sig_pri_available(struct sig_pri_chan *p, int channelmatch, ast_group_t groupmatch, int *reason, int *channelmatched, int *groupmatched) +int sig_pri_available(struct sig_pri_chan *p, int *reason) { /* If no owner and interface has a B channel then likely available */ if (!p->owner && !p->no_b_channel && p->pri) { diff --git a/channels/sig_pri.h b/channels/sig_pri.h index b1b1884..0525698 100644 --- a/channels/sig_pri.h +++ b/channels/sig_pri.h @@ -257,7 +257,7 @@ int sig_pri_indicate(struct sig_pri_chan *p, struct ast_channel *chan, int condi int sig_pri_answer(struct sig_pri_chan *p, struct ast_channel *ast); -int sig_pri_available(struct sig_pri_chan *p, int channelmatch, ast_group_t groupmatch, int *busy, int *channelmatched, int *groupmatched); +int sig_pri_available(struct sig_pri_chan *p, int *reason); void sig_pri_init_pri(struct sig_pri_pri *pri); -- 1.7.9.5