aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-08 15:39:42 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-08 15:39:42 +0000
commit2ac04b0c3d1e25317fc3da0e37034a04ef87bb93 (patch)
tree61062c49093c7f999d66e62727d6b12cdf139ac6
parentbcec07369712e22b9fc38ea2c6a402d32543453e (diff)
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: http://svn.digium.com/svn/asterisk/trunk@327045 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_dahdi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 321be6625..b94889ef4 100644
--- 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