[Gaim-commits] CVS: gaim/src proxy.c,1.149,1.150

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25460/src

Modified Files:
	proxy.c 
Log Message:
SF Patch #1411771 from Tim Mooney

This fixes some cases where we should be using socklen_t as the variable type.


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -p -r1.149 -r1.150
--- proxy.c	21 Jan 2006 02:00:54 -0000	1.149
+++ proxy.c	22 Jan 2006 21:02:52 -0000	1.150
@@ -923,7 +923,7 @@ static void
 no_one_calls(gpointer data, gint source, GaimInputCondition cond)
 {
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error=0, ret;
 
 	gaim_debug_info("proxy", "Connected.\n");
@@ -1018,7 +1018,7 @@ proxy_connect_none(struct PHB *phb, stru
 		}
 	}
 	else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 		gaim_debug_misc("proxy", "Connect didn't block.\n");
 		len = sizeof(error);
@@ -1205,7 +1205,7 @@ http_canwrite(gpointer data, gint source
 	char request[8192];
 	int request_len = 0;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	gaim_debug_info("http proxy", "Connected.\n");
@@ -1296,7 +1296,7 @@ proxy_connect_http(struct PHB *phb, stru
 		}
 	}
 	else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 
 		gaim_debug_misc("http proxy",
@@ -1347,7 +1347,7 @@ s4_canwrite(gpointer data, gint source, 
 	unsigned char packet[12];
 	struct hostent *hp;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	gaim_debug_info("socks4 proxy", "Connected.\n");
@@ -1430,7 +1430,7 @@ proxy_connect_socks4(struct PHB *phb, st
 			return -1;
 		}
 	} else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 
 		gaim_debug_misc("socks4 proxy",
@@ -1778,7 +1778,7 @@ s5_canwrite(gpointer data, gint source, 
 	unsigned char buf[512];
 	int i;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	gaim_debug_info("socks5 proxy", "Connected.\n");
@@ -1854,7 +1854,7 @@ proxy_connect_socks5(struct PHB *phb, st
 		}
 	}
 	else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 
 		gaim_debug_misc("socks5 proxy",