From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 10 Jul 2014 01:42:26 +0000 (+0000)
Subject: chan_dahdi/sig_pri: Fix type mismatch in the idledial feature's channel creation.
X-Git-Tag: 11.12.0-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073356fa189e90fcf7e6c286a6dbb26331027a50;p=thirdparty%2Fasterisk.git

chan_dahdi/sig_pri: Fix type mismatch in the idledial feature's channel creation.

Square pegs in round holes don't work very well.
........

Merged revisions 418261 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@418262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 3e231f6249..89f2e20df5 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -964,12 +964,12 @@ static int sig_pri_play_tone(struct sig_pri_chan *p, enum sig_pri_tone tone)
 	}
 }
 
-static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state, int ulaw, int transfercapability, char *exten, const struct ast_channel *requestor)
+static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state, enum sig_pri_law law, int transfercapability, char *exten, const struct ast_channel *requestor)
 {
 	struct ast_channel *c;
 
 	if (sig_pri_callbacks.new_ast_channel) {
-		c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, ulaw, exten, requestor);
+		c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, law, exten, requestor);
 	} else {
 		return NULL;
 	}
@@ -5743,7 +5743,7 @@ static void sig_pri_handle_setup(struct sig_pri_span *pri, pri_event *e)
 	int exten_exists_or_can_exist;
 	int could_match_more;
 	int need_dialtone;
-	int law;
+	enum sig_pri_law law;
 	int chanpos = -1;
 	struct ast_callid *callid = NULL;
 	struct ast_channel *c;
@@ -6210,7 +6210,7 @@ static void *pri_dchannel(void *vpri)
 					 */
 					sig_pri_lock_private(pri->pvts[nextidle]);
 					sig_pri_unlock_private(pri->pvts[nextidle]);
-					idle = sig_pri_request(pri->pvts[nextidle], AST_FORMAT_ULAW, NULL, 0);
+					idle = sig_pri_request(pri->pvts[nextidle], SIG_PRI_ULAW, NULL, 0);
 					ast_mutex_lock(&pri->lock);
 					if (idle) {
 						pri->pvts[nextidle]->isidlecall = 1;