[asterisk-commits] murf: branch 1.6.1 r174434 - in /branches/1.6.1: ./ apps/app_rpt.c

[SVN commits to the Asterisk project]

Author: murf
Date: Mon Feb  9 22:46:17 2009
New Revision: 174434

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174434
Log:
Merged revisions 174432 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r174432 | murf | 2009-02-09 21:36:22 -0700 (Mon, 09 Feb 2009) | 3 lines

More intptr_t work.


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_rpt.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_rpt.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_rpt.c?view=diff&rev=174434&r1=174433&r2=174434
==============================================================================
--- branches/1.6.1/apps/app_rpt.c (original)
+++ branches/1.6.1/apps/app_rpt.c Mon Feb  9 22:46:17 2009
@@ -601,7 +601,7 @@
 	struct rpt_link mylink;
 	char param[TELEPARAMSIZE];
 	intptr_t submode;
-	unsigned int parrot;
+	uintptr_t  parrot;
 	pthread_t threadid;
 } ;
 
@@ -4972,7 +4972,7 @@
 
 	    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)
 		{
 			imdone = 1;
@@ -4980,14 +4980,14 @@
 			break;
 		}
 		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);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else
 			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		ast_stopstream(mychannel);
-		sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot);
+		sprintf(mystr,PARROTFILE,myrpt->name,(unsigned int)mytele->parrot);
 		strcat(mystr,".wav");
 		unlink(mystr);			
 		imdone = 1;
@@ -5255,7 +5255,7 @@
 	memset((char *)tele,0,sizeof(struct rpt_tele));
 	tele->rpt = myrpt;
 	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;
 	rpt_mutex_lock(&myrpt->lock);
 	if((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED) ||
@@ -11991,7 +11991,7 @@
 				ast_closestream(myrpt->parrotstream);
 			myrpt->parrotstream = NULL;
 			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)
 		{ /* there is a command waiting to be processed */