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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@327045 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 321be66..b94889e 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -3072,9 +3072,9 @@ static int sig_pri_tone_to_dahditone(enum sig_pri_tone tone)
 #if defined(HAVE_PRI)
 static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
 {
-       int x, res;
+       int x;
 
-       res = ioctl(pri->fds[index], DAHDI_GETEVENT, &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 @@ quit_no_clean:
 */
 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 @@ static int mwi_send_init(struct dahdi_pvt * pvt)
                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