Author: rmudgett
Date: Thu Feb 19 15:23:58 2015
New Revision: 431992
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431992
Log:
chan_dahdi: Remove some dead code.
Modified:
branches/11/channels/chan_dahdi.c
branches/11/channels/sig_analog.c
Modified: branches/11/channels/chan_dahdi.c
URL:
http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_dahdi.c?view=diff&rev=431992&r1=431991&r2=431992
==============================================================================
--- branches/11/channels/chan_dahdi.c (original)
+++ branches/11/channels/chan_dahdi.c Thu Feb 19 15:23:58 2015
@@ -1883,7 +1883,8 @@
for (;;) {
i = DAHDI_IOMUX_READ | DAHDI_IOMUX_SIGEVENT;
- if ((res = ioctl(p->subs[idx].dfd, DAHDI_IOMUX, &i))) {
+ res = ioctl(p->subs[idx].dfd, DAHDI_IOMUX, &i);
+ if (res) {
ast_log(LOG_WARNING, "I/O MUX failed: %s\n",
strerror(errno));
ast_hangup(chan);
return 1;
@@ -1918,7 +1919,6 @@
}
if (analog_p->ringt > 0) {
if (!(--analog_p->ringt)) {
- res = -1;
break;
}
}
Modified: branches/11/channels/sig_analog.c
URL:
http://svnview.digium.com/svn/asterisk/branches/11/channels/sig_analog.c?view=diff&rev=431992&r1=431991&r2=431992
==============================================================================
--- branches/11/channels/sig_analog.c (original)
+++ branches/11/channels/sig_analog.c Thu Feb 19 15:23:58 2015
@@ -1747,7 +1747,6 @@
char dtmfbuf[300];
char namebuf[ANALOG_MAX_CID];
char numbuf[ANALOG_MAX_CID];
- struct callerid_state *cs = NULL;
char *name = NULL, *number = NULL;
int flags = 0;
struct ast_smdi_md_message *smdi_msg = NULL;
@@ -2397,7 +2396,6 @@
int timeout_ms;
int ms;
struct timeval start = ast_tvnow();
- cs = NULL;
ast_debug(1, "Receiving DTMF cid on channel
%s\n", ast_channel_name(chan));
oldlinearity = analog_set_linear_mode(p, idx,
0);
@@ -2615,18 +2613,12 @@
} else {
ast_log(LOG_WARNING, "Unable to get caller ID
space\n");
}
- } else {
- cs = NULL;
}
if (number) {
ast_shrink_phone_number(number);
}
ast_set_callerid(chan, number, name, number);
-
- if (cs) {
- callerid_free(cs);
- }
analog_handle_notify_message(chan, p, flags, -1);
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
