Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv1054/channels
Modified Files:
chan_iax2.c chan_mgcp.c chan_sip.c chan_skinny.c
Log Message:
correct some signed/unsigned issues found by GCC 4 (bug #4237)
Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- chan_iax2.c 15 May 2005 00:15:14 -0000 1.282
+++ chan_iax2.c 15 May 2005 03:21:51 -0000 1.283
@@ -6089,7 +6089,7 @@
int updatehistory=1;
int new = NEW_PREVENT;
char buf[4096], *ptr;
- int len = sizeof(sin);
+ socklen_t len = sizeof(sin);
int dcallno = 0;
struct ast_iax2_full_hdr *fh = (struct ast_iax2_full_hdr *)buf;
struct ast_iax2_mini_hdr *mh = (struct ast_iax2_mini_hdr *)buf;
Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- chan_mgcp.c 8 May 2005 16:44:25 -0000 1.120
+++ chan_mgcp.c 15 May 2005 03:21:51 -0000 1.121
@@ -297,7 +297,7 @@
unsigned int seqno;
int len;
struct mgcp_message *next;
- unsigned char buf[0];
+ char buf[0];
};
#define RESPONSE_TIMEOUT 30 /* in seconds */
@@ -307,7 +307,7 @@
int len;
int seqno;
struct mgcp_response *next;
- unsigned char buf[0];
+ char buf[0];
};
#define MAX_SUBS 2
@@ -722,7 +722,7 @@
/* SC: modified for the new transaction mechanism */
static int mgcp_postrequest(struct mgcp_endpoint *p, struct mgcp_subchannel
*sub,
- unsigned char *data, int len, unsigned int seqno)
+ char *data, int len, unsigned int seqno)
{
struct mgcp_message *msg = malloc(sizeof(struct mgcp_message) + len);
struct mgcp_message *cur;
@@ -3286,7 +3286,7 @@
struct sockaddr_in sin;
struct mgcp_subchannel *sub;
int res;
- int len;
+ socklen_t len;
int result;
int ident;
char iabuf[INET_ADDRSTRLEN];
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -d -r1.730 -r1.731
--- chan_sip.c 15 May 2005 03:03:48 -0000 1.730
+++ chan_sip.c 15 May 2005 03:21:51 -0000 1.731
@@ -1230,7 +1230,7 @@
/*--- register_peer_exten: Automatically add peer extension to dial plan ---*/
static void register_peer_exten(struct sip_peer *peer, int onoff)
{
- unsigned char multi[256]="";
+ char multi[256]="";
char *stringp, *ext;
if (!ast_strlen_zero(regcontext)) {
ast_copy_string(multi, ast_strlen_zero(peer->regexten) ?
peer->name : peer->regexten, sizeof(multi));
@@ -9207,7 +9207,7 @@
struct sockaddr_in sin = { 0, };
struct sip_pvt *p;
int res;
- int len;
+ socklen_t len;
int nounlock;
int recount = 0;
int debug;
Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- chan_skinny.c 29 Apr 2005 17:00:33 -0000 1.72
+++ chan_skinny.c 15 May 2005 03:21:51 -0000 1.73
@@ -2688,7 +2688,7 @@
{
int as;
struct sockaddr_in sin;
- int sinlen;
+ socklen_t sinlen;
struct skinnysession *s;
struct protoent *p;
int arg = 1;
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
