kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_dahdi: Remove some dead code.

Browse Source 
........

Merged revisions 431992 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@431993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2015-02-19 21:25:22 +00:00
parent 40547e7210
commit e0ff83c272
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_dahdi.c
View File

@@ -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;
}
}

8
channels/sig_analog.c
View File

@@ -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);