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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index a6829f1c97222b23bb99f822cde6b33ab3a4366c..2e15b84cf081fa568f7856d09b52b3b147c3d53c 100644 (file)
--- 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 1fe2d53124982a89aef37ae210b2460ce6d87cfb..cf9d066b3e319912c7f48c29e6f62b0bb0c1a116 100644 (file)
--- 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 5993e9f5434fc2a5ccb926831116456f5f027421..76972fe941b3768847a976e97d1dd023c6b2b676 100644 (file)
--- 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 02ff0a198004522d50e952dd33747f5c6f065d2d..284b81020610ceed3eec9d43efc0e712c8fefdb0 100644 (file)
--- 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 b1b1884a41cce9abc6c12032da22092247504aad..05256985d6a9e79ed503703be43f468b3fe5d880 100644 (file)
--- 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);