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

[SVN commits to the Asterisk project]

Author: murf
Date: Mon Feb  9 22:09:42 2009
New Revision: 174428

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

................
  r174370 | murf | 2009-02-09 19:45:56 -0700 (Mon, 09 Feb 2009) | 10 lines
  
  Merged revisions 174369 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r174369 | murf | 2009-02-09 19:27:40 -0700 (Mon, 09 Feb 2009) | 5 lines
    
    This patch solves some compiler complaints
    in both 32 and 64-bit environments.
  ........
................

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=174428&r1=174427&r2=174428
==============================================================================
--- branches/1.6.1/apps/app_rpt.c (original)
+++ branches/1.6.1/apps/app_rpt.c Mon Feb  9 22:09:42 2009
@@ -318,6 +318,7 @@
 
 #include <signal.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
@@ -599,7 +600,7 @@
 	int	mode;
 	struct rpt_link mylink;
 	char param[TELEPARAMSIZE];
-	int	submode;
+	intptr_t submode;
 	unsigned int parrot;
 	pthread_t threadid;
 } ;
@@ -5268,7 +5269,7 @@
 		strncpy(tele->param, (char *) data, TELEPARAMSIZE - 1);
 		tele->param[TELEPARAMSIZE - 1] = 0;
 	}
-	if (mode == REMXXX) tele->submode = (int) data;
+	if (mode == REMXXX) tele->submode = (intptr_t) data;
 	insque((struct qelem *)tele, (struct qelem *)myrpt->tele.next);
 	rpt_mutex_unlock(&myrpt->lock);
         pthread_attr_init(&attr);
@@ -6375,6 +6376,7 @@
 static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
 	char string[16];
+	int res;
 
 	int i, r;
 
@@ -6383,7 +6385,7 @@
 	
 	switch(myatoi(param)){
 		case 1: /* System reset */
-			system("killall -9 asterisk");
+			res = system("killall -9 asterisk");
 			return DC_COMPLETE;
 
 		case 2:
@@ -9636,7 +9638,8 @@
 static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
 	char *s,*s1,*s2;
-	int i,j,p,r,ht,k,l,ls2,m,d,offset,offsave, modesave, defmode;
+	int i,j,r,ht,k,l,ls2,m,d,offset,offsave, modesave, defmode=0;
+	intptr_t p;
 	char multimode = 0;
 	char oc,*cp,*cp1,*cp2;
 	char tmp[20], freq[20] = "", savestr[20] = "";