diff options
| -rw-r--r-- | channels/chan_dahdi.c | 4 | ||||
| -rw-r--r-- | channels/sig_analog.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 10b6295cd..72c8497f0 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1423,7 +1423,8 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int 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 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int } if (analog_p->ringt > 0) { if (!(--analog_p->ringt)) { - res = -1; break; } } diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 3740d4b2b..c24df6915 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -1703,7 +1703,6 @@ static void *__analog_ss_thread(void *data) 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 @@ static void *__analog_ss_thread(void *data) 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,8 +2607,6 @@ static void *__analog_ss_thread(void *data) } else { ast_log(LOG_WARNING, "Unable to get caller ID space\n"); } - } else { - cs = NULL; } if (number) { @@ -2618,10 +2614,6 @@ static void *__analog_ss_thread(void *data) } ast_set_callerid(chan, number, name, number); - if (cs) { - callerid_free(cs); - } - analog_handle_notify_message(chan, p, flags, -1); ast_channel_lock(chan); |