diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 15:13:54 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 15:13:54 +0000 |
commit | 636da18aef62d45c2a4d5c8375db4e3e9a6a8fa7 (patch) | |
tree | 0897894650d3dde3ed9811ef6d72420445a13423 /channels/misdn | |
parent | 177767109c3763492cd688a7f3300fd0eef513f7 (diff) |
Merged revisions 107466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r107466 | kpfleming | 2008-03-11 10:13:38 -0500 (Tue, 11 Mar 2008) | 10 lines
Merged revisions 107464 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107464 | kpfleming | 2008-03-11 09:53:03 -0500 (Tue, 11 Mar 2008) | 2 lines
fix various other problems found by gcc 4.3
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107467 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
-rw-r--r-- | channels/misdn/isdn_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index b951e2ea8..90a6c8d36 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -2419,12 +2419,12 @@ static int handle_bchan(msg_t *msg) case PH_CONTROL|INDICATION: { - unsigned int cont = *((unsigned int *)&frm->data.p); + unsigned int *cont = (unsigned int *) &frm->data.p; cb_log(4, stack->port, "PH_CONTROL: channel:%d oad%d:%s dad%d:%s \n", bc->channel, bc->onumplan,bc->oad, bc->dnumplan,bc->dad); - if ((cont&~DTMF_TONE_MASK) == DTMF_TONE_VAL) { - int dtmf = cont & DTMF_TONE_MASK; + if ((*cont & ~DTMF_TONE_MASK) == DTMF_TONE_VAL) { + int dtmf = *cont & DTMF_TONE_MASK; cb_log(4, stack->port, " --> DTMF TONE: %c\n",dtmf); bc->dtmf=dtmf; cb_event(EVENT_DTMF_TONE, bc, glob_mgr->user_data); @@ -2432,12 +2432,12 @@ static int handle_bchan(msg_t *msg) free_msg(msg); return 1; } - if (cont == BF_REJECT) { + if (*cont == BF_REJECT) { cb_log(4, stack->port, " --> BF REJECT\n"); free_msg(msg); return 1; } - if (cont == BF_ACCEPT) { + if (*cont == BF_ACCEPT) { cb_log(4, stack->port, " --> BF ACCEPT\n"); free_msg(msg); return 1; |