Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

More intptr_t work.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@174432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Steve Murphy 17 years ago
parent dbe56b6647
commit 43462557c0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
apps/app_rpt.c
Unescape View File

@ -601,7 +601,7 @@ struct rpt_tele
struct rpt_link mylink; struct rpt_link mylink;
char param[TELEPARAMSIZE]; char param[TELEPARAMSIZE];
intptr_t submode; intptr_t submode;
unsigned int parrot; uintptr_t parrot;
pthread_t threadid; pthread_t threadid;
} ; } ;
@ -4972,7 +4972,7 @@ struct dahdi_params par;
case PARROT: /* Repeat stuff */ case PARROT: /* Repeat stuff */
sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot); sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot);
if (ast_fileexists(mystr,NULL,mychannel->language) <= 0) if (ast_fileexists(mystr,NULL,mychannel->language) <= 0)
{ {
imdone = 1; imdone = 1;
@ -4980,14 +4980,14 @@ struct dahdi_params par;
break; break;
} }
wait_interval(myrpt, DLY_PARROT, mychannel); wait_interval(myrpt, DLY_PARROT, mychannel);
sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot); sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot);
res = ast_streamfile(mychannel, mystr, mychannel->language); res = ast_streamfile(mychannel, mystr, mychannel->language);
if (!res) if (!res)
res = ast_waitstream(mychannel, ""); res = ast_waitstream(mychannel, "");
else else
ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name); ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
ast_stopstream(mychannel); ast_stopstream(mychannel);
sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot); sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot);
strcat(mystr,".wav"); strcat(mystr,".wav");
unlink(mystr); unlink(mystr);
imdone = 1; imdone = 1;
@ -5255,7 +5255,7 @@ char *v1, *v2;
memset((char *)tele,0,sizeof(struct rpt_tele)); memset((char *)tele,0,sizeof(struct rpt_tele));
tele->rpt = myrpt; tele->rpt = myrpt;
tele->mode = mode; tele->mode = mode;
if (mode == PARROT) tele->parrot = (unsigned int) data; if (mode == PARROT) tele->parrot = (uintptr_t) data;
else mylink = (struct rpt_link *) data; else mylink = (struct rpt_link *) data;
rpt_mutex_lock(&myrpt->lock); rpt_mutex_lock(&myrpt->lock);
if((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED) || if((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED) ||
@ -11991,7 +11991,7 @@ char tmpstr[300],lstr[MAXLINKLIST];
ast_closestream(myrpt->parrotstream); ast_closestream(myrpt->parrotstream);
myrpt->parrotstream = NULL; myrpt->parrotstream = NULL;
myrpt->parrotstate = 2; myrpt->parrotstate = 2;
rpt_telemetry(myrpt,PARROT,(struct rpt_link *) myrpt->parrotcnt++); rpt_telemetry(myrpt,PARROT,(void *) ((intptr_t)myrpt->parrotcnt++));
} }
if (myrpt->cmdAction.state == CMD_STATE_READY) if (myrpt->cmdAction.state == CMD_STATE_READY)
{ /* there is a command waiting to be processed */ { /* there is a command waiting to be processed */

Write Preview
Loading…
Cancel
Save