[asterisk-commits] russell: trunk r327045 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jul  8 10:39:42 2011
New Revision: 327045

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=327045
Log:
Merged revisions 327044 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327044 | russell | 2011-07-08 10:28:44 -0500 (Fri, 08 Jul 2011) | 2 lines
  
  Resolve some set-but-unused-variable warnings.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=327045&r1=327044&r2=327045
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jul  8 10:39:42 2011
@@ -3072,9 +3072,9 @@
 #if defined(HAVE_PRI)
 static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
 {
-	int x, res;
-
-	res = ioctl(pri->fds[index], DAHDI_GETEVENT, &x);
+	int x;
+
+	ioctl(pri->fds[index], DAHDI_GETEVENT, &x);
 	if (x) {
 		ast_log(LOG_NOTICE, "PRI got event: %s (%d) on D-channel of span %d\n", event2str(x), x, pri->span);
 	}
@@ -11075,7 +11075,7 @@
 */
 static int mwi_send_init(struct dahdi_pvt * pvt)
 {
-	int x, res;
+	int x;
 	struct ast_format tmpfmt;
 
 #ifdef HAVE_DAHDI_LINEREVERSE_VMWI
@@ -11112,7 +11112,7 @@
 		return -1;
 	}
 	x = DAHDI_FLUSH_BOTH;
-	res = ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_FLUSH, &x);
+	ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_FLUSH, &x);
 	x = 3000;
 	ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_ONHOOKTRANSFER, &x);
 #ifdef HAVE_DAHDI_LINEREVERSE_VMWI