[asterisk-commits] rmudgett: branch 12 r418263 - in /branches/12: ./ channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jul  9 20:52:24 2014
New Revision: 418263

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418263
Log:
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
........

Merged revisions 418262 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/channels/sig_pri.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/sig_pri.c?view=diff&rev=418263&r1=418262&r2=418263
==============================================================================
--- branches/12/channels/sig_pri.c (original)
+++ branches/12/channels/sig_pri.c Wed Jul  9 20:52:24 2014
@@ -1029,13 +1029,13 @@
 }
 
 static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state,
-	int ulaw, int transfercapability, char *exten,
+	enum sig_pri_law law, int transfercapability, char *exten,
 	const struct ast_assigned_ids *assignedids, 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, assignedids, requestor);
+		c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, law, exten, assignedids, requestor);
 	} else {
 		return NULL;
 	}
@@ -5869,7 +5869,7 @@
 	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;
@@ -6336,7 +6336,7 @@
 					 */
 					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, NULL, 0);
+					idle = sig_pri_request(pri->pvts[nextidle], SIG_PRI_ULAW, NULL, NULL, 0);
 					ast_mutex_lock(&pri->lock);
 					if (idle) {
 						pri->pvts[nextidle]->isidlecall = 1;