Author: rmudgett Date: Thu Feb 19 15:26:55 2015 New Revision: 431994 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431994 Log: chan_dahdi: Remove some dead code. ........
Merged revisions 431992 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 431993 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/channels/chan_dahdi.c trunk/channels/sig_analog.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-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=431994&r1=431993&r2=431994 ============================================================================== --- trunk/channels/chan_dahdi.c (original) +++ trunk/channels/chan_dahdi.c Thu Feb 19 15:26:55 2015 @@ -1423,7 +1423,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; @@ -1458,7 +1459,6 @@ } if (analog_p->ringt > 0) { if (!(--analog_p->ringt)) { - res = -1; break; } } Modified: trunk/channels/sig_analog.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.c?view=diff&rev=431994&r1=431993&r2=431994 ============================================================================== --- trunk/channels/sig_analog.c (original) +++ trunk/channels/sig_analog.c Thu Feb 19 15:26:55 2015 @@ -1703,7 +1703,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; @@ -2391,7 +2390,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); @@ -2609,18 +2607,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
