[asterisk-commits] rmudgett: trunk r220792 - in /trunk/channels: chan_dahdi.c sig_pri.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Sep 28 16:02:20 2009
New Revision: 220792

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220792
Log:
Miscellaneous minor changes.

Modified:
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_pri.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=220792&r1=220791&r2=220792
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Mon Sep 28 16:02:20 2009
@@ -292,8 +292,6 @@
 
 /*! \brief Typically, how many rings before we should send Caller*ID */
 #define DEFAULT_CIDRINGS 1
-
-#define CHANNEL_PSEUDO -12
 
 #define AST_LAW(p) (((p)->law == DAHDI_LAW_ALAW) ? AST_FORMAT_ALAW : AST_FORMAT_ULAW)
 
@@ -5194,8 +5192,7 @@
 		dahdi_setlinear(p->subs[SUB_REAL].dfd, 0);
 		law = DAHDI_LAW_DEFAULT;
 		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_SETLAW, &law);
-		if (p->sig)
-			dahdi_disable_ec(p);
+		dahdi_disable_ec(p);
 		update_conf(p);
 		reset_conf(p);
 		sig_pri_hangup(p->sig_pvt, ast);
@@ -11390,7 +11387,7 @@
 				analog_config_complete(analog_p);
 			}
 		}
-#ifdef HAVE_PRI
+#if defined(HAVE_PRI)
 		else if (pchan != NULL) {
 			pchan->channel = tmp->channel;
 			pchan->hidecallerid = tmp->hidecallerid;
@@ -11405,7 +11402,7 @@
 			ast_copy_string(pchan->mohinterpret, tmp->mohinterpret, sizeof(pchan->mohinterpret));
 			pchan->stripmsd = tmp->stripmsd;
 		}
-#endif
+#endif	/* defined(HAVE_PRI) */
 	}
 	if (tmp && !here) {
 		/* Add the new channel interface to the sorted channel interface list. */

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=220792&r1=220791&r2=220792
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Mon Sep 28 16:02:20 2009
@@ -2360,6 +2360,7 @@
 				break;
 			default:
 				ast_debug(1, "Event: %d\n", e->e);
+				break;
 			}
 		}
 		ast_mutex_unlock(&pri->lock);
@@ -2800,7 +2801,7 @@
 			chan->_softhangup |= AST_SOFTHANGUP_DEV;
 			res = 0;
 		} else if (!p->progress && p->pri && !p->outgoing) {
-			if (p->pri) {
+			if (p->pri->pri) {
 				if (!pri_grab(p, p->pri)) {
 #ifdef HAVE_PRI_PROG_W_CAUSE
 					pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_SWITCH_CONGESTION); /* cause = 42 */