[svn-commits] qwell: branch qwell/hold_events r389620 - /team/qwell/hold_events/channels/

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu May 23 15:58:54 2013
New Revision: 389620

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389620
Log:
Be inconsistent. :p

Modified:
    team/qwell/hold_events/channels/sig_pri.c

Modified: team/qwell/hold_events/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/hold_events/channels/sig_pri.c?view=diff&rev=389620&r1=389619&r2=389620
==============================================================================
--- team/qwell/hold_events/channels/sig_pri.c (original)
+++ team/qwell/hold_events/channels/sig_pri.c Thu May 23 15:58:54 2013
@@ -1258,7 +1258,7 @@
  *
  * \return Nothing
  */
-static void pri_queue_hold(struct sig_pri_span *pri, int chanpos)
+static void sig_pri_queue_hold(struct sig_pri_span *pri, int chanpos)
 {
 	sig_pri_lock_owner(pri, chanpos);
 	if (pri->pvts[chanpos]->owner) {
@@ -1280,7 +1280,7 @@
  *
  * \return Nothing
  */
-static void pri_queue_unhold(struct sig_pri_span *pri, int chanpos)
+static void sig_pri_queue_unhold(struct sig_pri_span *pri, int chanpos)
 {
 	sig_pri_lock_owner(pri, chanpos);
 	if (pri->pvts[chanpos]->owner) {
@@ -5335,11 +5335,11 @@
 		goto done_with_owner;
 	}
 	sig_pri_handle_subcmds(pri, chanpos_old, ev->e, ev->hold.subcmds, ev->hold.call);
-	pri_queue_hold(pri, chanpos_old);
+	sig_pri_queue_hold(pri, chanpos_old);
 	chanpos_new = pri_fixup_principle(pri, chanpos_new, ev->hold.call);
 	if (chanpos_new < 0) {
 		/* Should never happen. */
-		pri_queue_unhold(pri, chanpos_old);
+		sig_pri_queue_unhold(pri, chanpos_old);
 	}
 
 done_with_owner:;
@@ -5528,7 +5528,7 @@
 	callid = func_pri_dchannel_chanpos_callid(pri, chanpos);
 	sig_pri_handle_subcmds(pri, chanpos, ev->e, ev->retrieve.subcmds, ev->retrieve.call);
 	sig_pri_lock_owner(pri, chanpos);
-	pri_queue_unhold(pri, chanpos);
+	sig_pri_queue_unhold(pri, chanpos);
 	if (pri->pvts[chanpos]->owner) {
 		ast_channel_unlock(pri->pvts[chanpos]->owner);
 	}
@@ -7433,12 +7433,12 @@
 				switch (e->notify.info) {
 				case PRI_NOTIFY_REMOTE_HOLD:
 					if (!pri->discardremoteholdretrieval) {
-						pri_queue_hold(pri, chanpos);
+						sig_pri_queue_hold(pri, chanpos);
 					}
 					break;
 				case PRI_NOTIFY_REMOTE_RETRIEVAL:
 					if (!pri->discardremoteholdretrieval) {
-						pri_queue_unhold(pri, chanpos);
+						sig_pri_queue_unhold(pri, chanpos);
 					}
 					break;
 				}