kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 174369 via svnmerge from

Browse Source 
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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@174370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2009-02-10 02:45:56 +00:00
parent e0b0ae07a3
commit dbe56b6647
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_rpt.c
View File

@@ -318,6 +318,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -599,7 +600,7 @@ struct rpt_tele
int mode; int mode;
struct rpt_link mylink; struct rpt_link mylink;
char param[TELEPARAMSIZE]; char param[TELEPARAMSIZE];
int submode; intptr_t submode;
unsigned int parrot; unsigned int parrot;
pthread_t threadid; pthread_t threadid;
} ; } ;
@@ -5268,7 +5269,7 @@ char *v1, *v2;
strncpy(tele->param, (char *) data, TELEPARAMSIZE - 1); strncpy(tele->param, (char *) data, TELEPARAMSIZE - 1);
tele->param[TELEPARAMSIZE - 1] = 0; 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); insque((struct qelem *)tele, (struct qelem *)myrpt->tele.next);
rpt_mutex_unlock(&myrpt->lock); rpt_mutex_unlock(&myrpt->lock);
pthread_attr_init(&attr); pthread_attr_init(&attr);
@@ -6375,6 +6376,7 @@ static int function_playback(struct rpt *myrpt, char *param, char *digitbuf, int
static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
{ {
char string[16]; char string[16];
int res;
int i, r; int i, r;
@@ -6383,7 +6385,7 @@ static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int comm
switch(myatoi(param)){ switch(myatoi(param)){
case 1: /* System reset */ case 1: /* System reset */
system("killall -9 asterisk"); res = system("killall -9 asterisk");
return DC_COMPLETE; return DC_COMPLETE;
case 2: case 2:
@@ -9636,7 +9638,8 @@ static int channel_revert(struct rpt *myrpt)
static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
{ {
char *s,*s1,*s2; 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 multimode = 0;
char oc,*cp,*cp1,*cp2; char oc,*cp,*cp1,*cp2;
char tmp[20], freq[20] = "", savestr[20] = ""; char tmp[20], freq[20] = "", savestr[20] = "";