--- sourceforge.net/trunk/rdesktop/tcp.c	2004/06/15 22:17:08	710
+++ sourceforge.net/trunk/rdesktop/tcp.c	2005/03/31 10:49:59	872
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - TCP layer
-   Copyright (C) Matthew Chapman 1999-2002
+   Copyright (C) Matthew Chapman 1999-2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -148,9 +148,7 @@
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 
-	n = getaddrinfo(server, tcp_port_rdp_s, &hints, &res);
-
-	if (n < 0)
+	if ((n = getaddrinfo(server, tcp_port_rdp_s, &hints, &res)))
 	{
 		error("getaddrinfo: %s\n", gai_strerror(n));
 		return False;
@@ -234,7 +232,7 @@
 {
 	static char ipaddr[32];
 	struct sockaddr_in sockaddr;
-	size_t len = sizeof(sockaddr);
+	socklen_t len = sizeof(sockaddr);
 	if (getsockname(sock, (struct sockaddr *) &sockaddr, &len) == 0)
 	{
 		unsigned char *ip = (unsigned char *) &sockaddr.sin_addr;