[asterisk-commits] jpeeler: branch jpeeler/chan_dahdi r118609 - in /team/jpeeler/chan_dahdi: app...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue May 27 15:58:05 2008
New Revision: 118609

URL: http://svn.digium.com/view/asterisk?view=rev&rev=118609
Log:
fix a few typos

Modified:
    team/jpeeler/chan_dahdi/apps/app_zapbarge.c
    team/jpeeler/chan_dahdi/channels/chan_dahdi.c

Modified: team/jpeeler/chan_dahdi/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_zapbarge.c?view=diff&rev=118609&r1=118608&r2=118609
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_zapbarge.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_zapbarge.c Tue May 27 15:58:05 2008
@@ -236,10 +236,10 @@
 	else {
 		/* Take out of conference */
 		/* Add us to the conference */
-		dahdi_conf.chan = 0;	
-		dahdi_conf.confno = 0;
-		dahdi_conf.confmode = 0;
-		if (ioctl(fd, DAHDI_SETCONF, &dahdi_conf)) {
+		dahdic.chan = 0;	
+		dahdic.confno = 0;
+		dahdic.confmode = 0;
+		if (ioctl(fd, DAHDI_SETCONF, &dahdic)) {
 			ast_log(LOG_WARNING, "Error setting conference\n");
 		}
 	}

Modified: team/jpeeler/chan_dahdi/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/channels/chan_dahdi.c?view=diff&rev=118609&r1=118608&r2=118609
==============================================================================
--- team/jpeeler/chan_dahdi/channels/chan_dahdi.c (original)
+++ team/jpeeler/chan_dahdi/channels/chan_dahdi.c Tue May 27 15:58:05 2008
@@ -507,8 +507,6 @@
 	struct dahdi_subchannel subs[3];			/*!< Sub-channels */
 	struct dahdi_confinfo saveconf;			/*!< Saved conference info */
 
-	struct dahdi_pvt *slaves[MAX_SLAVES];		/*!< Slave to us (follows our conferencing) */
-	struct dahdi_pvt *master;				/*!< Master to us (we follow their conferencing) */
 	struct dahdi_pvt *slaves[MAX_SLAVES];		/*!< Slave to us (follows our conferencing) */
 	struct dahdi_pvt *master;				/*!< Master to us (we follow their conferencing) */
 	int inconference;				/*!< If our real should be in the conference */