diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 14:53:03 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 14:53:03 +0000 |
| commit | def35749cea03f9153b72e4aa6c0e2f2c74df887 (patch) | |
| tree | 4897def6b39e74d3d05d5946e8a59ed3b06cc6ac /channels | |
| parent | e350c6beb6eb363ad0243cf000c10c5dd3adcfcb (diff) | |
fix various other problems found by gcc 4.3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@107464 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_misdn.c | 6 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.c | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index c70c45938..bb31de0ba 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2008,13 +2008,9 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout) struct chan_list *ch=MISDN_ASTERISK_TECH_PVT(ast); struct misdn_bchannel *newbc; char *opts=NULL, *ext; - char dest_cp[256]; { - strncpy(dest_cp,dest,sizeof(dest_cp)-1); - dest_cp[sizeof(dest_cp)]=0; - - ext=dest_cp; + ext = ast_strdupa(dest); strsep(&ext,"/"); if (ext) { opts=ext; diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 6d30afdc8..64b92f66a 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -2407,12 +2407,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); @@ -2420,12 +2420,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; |