Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv1054
Modified Files:
asterisk.c dsp.c manager.c rtp.c
Log Message:
correct some signed/unsigned issues found by GCC 4 (bug #4237)
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- asterisk.c 8 May 2005 16:44:25 -0000 1.152
+++ asterisk.c 15 May 2005 03:21:51 -0000 1.153
@@ -327,7 +327,7 @@
{
struct sockaddr_un sunaddr;
int s;
- int len;
+ socklen_t len;
int x;
int flags;
struct pollfd fds[1];
Index: dsp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dsp.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dsp.c 22 Apr 2005 13:11:34 -0000 1.40
+++ dsp.c 15 May 2005 03:21:51 -0000 1.41
@@ -1303,7 +1303,7 @@
int res;
int digit;
int x;
- unsigned short *shortdata;
+ short *shortdata;
unsigned char *odata;
int len;
int writeback = 0;
@@ -1315,11 +1315,11 @@
break; \
case AST_FORMAT_ULAW: \
for (x=0;x<len;x++) \
- odata[x] = AST_LIN2MU(shortdata[x]); \
+ odata[x] = AST_LIN2MU((unsigned
short)shortdata[x]); \
break; \
case AST_FORMAT_ALAW: \
for (x=0;x<len;x++) \
- odata[x] = AST_LIN2A(shortdata[x]); \
+ odata[x] = AST_LIN2A((unsigned
short)shortdata[x]); \
break; \
} \
} \
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- manager.c 15 May 2005 02:54:47 -0000 1.95
+++ manager.c 15 May 2005 03:21:51 -0000 1.96
@@ -1358,7 +1358,7 @@
{
int as;
struct sockaddr_in sin;
- int sinlen;
+ socklen_t sinlen;
struct mansession *s;
struct protoent *p;
int arg = 1;
Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- rtp.c 14 May 2005 23:57:44 -0000 1.127
+++ rtp.c 15 May 2005 03:21:51 -0000 1.128
@@ -313,7 +313,7 @@
struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
{
static struct ast_frame null_frame = { AST_FRAME_NULL, };
- int len;
+ socklen_t len;
int hdrlen = 8;
int res;
struct sockaddr_in sin;
@@ -382,7 +382,7 @@
{
int res;
struct sockaddr_in sin;
- int len;
+ socklen_t len;
unsigned int seqno;
int version;
int payloadtype;
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
